read info records

components/esm/records.hpp

@@ -14,13 +14,13 @@
 #include "loadcont.hpp"
 #include "loadcrea.hpp"
 #include "loadcrec.hpp"
+#include "loadinfo.hpp"
 #include "loaddial.hpp"
 #include "loaddoor.hpp"
 #include "loadench.hpp"
 #include "loadfact.hpp"
 #include "loadglob.hpp"
 #include "loadgmst.hpp"
-#include "loadinfo.hpp"
 #include "loadingr.hpp"
 #include "loadland.hpp"
 #include "loadlevlist.hpp"

components/esm_store/store.cpp

@@ -18,32 +18,68 @@ static string toStr(int i)
 
 void ESMStore::load(ESMReader &esm)
 {
-  set<string> missing;
+    set<string> missing;
 
-  // Loop through all records
+    ESM::Dialogue *dialogue = 0;
-  while(esm.hasMoreRecs())
+
+    // Loop through all records
+    while(esm.hasMoreRecs())
     {
-      NAME n = esm.getRecName();
+        NAME n = esm.getRecName();
-      esm.getRecHeader();
+        esm.getRecHeader();
 
-      // Look up the record type.
+        // Look up the record type.
-      RecListList::iterator it = recLists.find(n.val);
+        RecListList::iterator it = recLists.find(n.val);
 
-      if(it == recLists.end())
+        if(it == recLists.end())
         {
-          // Not found (this would be an error later)
+            if (n.val==ESM::REC_INFO)
-          esm.skipRecord();
+            {
-          missing.insert(n.toString());
+                if (dialogue)
-          continue;
+                {
+                    ESM::DialInfo info;
+                    info.load (esm);
+                }
+                else
+                {
+                    std::cerr << "error: info record without dialog" << std::endl;
+                    esm.skipRecord();
+                    continue;
+                }
+            }
+            else
+            {
+                // Not found (this would be an error later)
+                esm.skipRecord();
+                missing.insert(n.toString());
+                continue;
+            }
         }
+        else
+        {
+            // Load it
+            std::string id = esm.getHNOString("NAME");
+            it->second->load(esm, id);
+
+            if (n.val==ESM::REC_DIAL)
+            {
+                RecListT<Dialogue>& recList = static_cast<RecListT<Dialogue>& > (*it->second);
+
+                id = recList.toLower (id);
 
-      // Load it
+                RecListT<Dialogue>::MapType::iterator iter = recList.list.find (id);
-      std::string id = esm.getHNOString("NAME");
-      it->second->load(esm, id);
 
-      // Insert the reference into the global lookup
+                assert (iter!=recList.list.end());
-      if(!id.empty())
+
-        all[id] = n.val;
+                dialogue = &iter->second;
+            }
+            else
+                dialogue = 0;
+
+            // Insert the reference into the global lookup
+            if(!id.empty())
+                all[id] = n.val;
+        }
     }
 
   /* This information isn't needed on screen. But keep the code around