mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-28 19:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Remove INAM handling from InfoCollection

Browse Source 
(cherry picked from commit 71e5fc7f0458f77e94879399a39e36393ed19409)
This commit is contained in:
Stanislav Bas 2015-07-13 11:19:14 +03:00 committed by cc9cii
parent 72152d84ed
commit bd695feded
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/opencs/model/world/infocollection.cpp
View File

@ -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) void CSMWorld::InfoCollection::load (ESM::ESMReader& reader, bool base, const ESM::Dialogue& dialogue)
{ {
std::string id = Misc::StringUtils::lowerCase (dialogue.mId) + "#" + Info info;
reader.getHNOString ("INAM"); info.load (reader);
std::string id = Misc::StringUtils::lowerCase (dialogue.mId) + "#" + info.mId;
if (reader.isNextSub ("DELE")) if (info.mIsDeleted)
{ {
int index = searchId (id); int index = searchId (id);
reader.skipRecord();
if (index==-1) if (index==-1)
{ {
// deleting a record that does not exist // deleting a record that does not exist
// ignore it for now // ignore it for now
/// \todo report the problem to the user /// \todo report the problem to the user
} }
else if (base) else if (base)
@ -136,12 +133,9 @@ void CSMWorld::InfoCollection::load (ESM::ESMReader& reader, bool base, const ES
} }
else else
{ {
Info record; info.mTopicId = dialogue.mId;
record.mTopicId = dialogue.mId; info.mId = id;
record.mId = id; load (info, base);
record.load (reader);
load (record, base);
} }
} }