From bd695feded1d688df6ad6dfbbc2a86b393f4d542 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Mon, 13 Jul 2015 11:19:14 +0300
Subject: [PATCH] Remove INAM handling from InfoCollection

(cherry picked from commit 71e5fc7f0458f77e94879399a39e36393ed19409)
---
 apps/opencs/model/world/infocollection.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index 60c613041..b61718637 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -106,21 +106,18 @@ bool CSMWorld::InfoCollection::reorderRows (int baseIndex, const std::vector<int
 
 void CSMWorld::InfoCollection::load (ESM::ESMReader& reader, bool base, const ESM::Dialogue& dialogue)
 {
-    std::string id = Misc::StringUtils::lowerCase (dialogue.mId) + "#" +
-        reader.getHNOString ("INAM");
+    Info info;
+    info.load (reader);
+    std::string id = Misc::StringUtils::lowerCase (dialogue.mId) + "#" + info.mId;
 
-    if (reader.isNextSub ("DELE"))
+    if (info.mIsDeleted)
     {
         int index = searchId (id);
 
-        reader.skipRecord();
-
         if (index==-1)
         {
             // deleting a record that does not exist
-
             // ignore it for now
-
             /// \todo report the problem to the user
         }
         else if (base)
@@ -136,12 +133,9 @@ void CSMWorld::InfoCollection::load (ESM::ESMReader& reader, bool base, const ES
     }
     else
     {
-        Info record;
-        record.mTopicId = dialogue.mId;
-        record.mId = id;
-        record.load (reader);
-
-        load (record, base);
+        info.mTopicId = dialogue.mId;
+        info.mId = id;
+        load (info, base);
     }
 }