mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-06 10:11:32 +00:00
Code Issues Releases Wiki Activity

read info records

Browse source
This commit is contained in:
Marc Zinnschlag 2010-08-06 15:19:39 +02:00
parent 10a63b10b5
commit d47de55ce9
2 changed files with 55 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esm/records.hpp
View file

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

72
components/esm_store/store.cpp
View file

@ -18,32 +18,68 @@ static string toStr(int i)
void ESMStore::load(ESMReader &esm) 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);
// Load it if (n.val==ESM::REC_DIAL)
std::string id = esm.getHNOString("NAME"); {
it->second->load(esm, id); RecListT<Dialogue>& recList = static_cast<RecListT<Dialogue>& > (*it->second);
// Insert the reference into the global lookup id = recList.toLower (id);
if(!id.empty())
all[id] = n.val; RecListT<Dialogue>::MapType::iterator iter = recList.list.find (id);
assert (iter!=recList.list.end());
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 /* This information isn't needed on screen. But keep the code around