teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove INAM handling from InfoCollection

Browse source
This commit is contained in:
Stanislav Bas 2015-07-13 11:19:14 +03:00
parent c8c79dc1ef
commit 71e5fc7f04
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

@ -107,21 +107,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)
@ -137,12 +134,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);
} }
} }