mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-16 07:20:54 +00:00
Remove INAM handling from InfoCollection
(cherry picked from commit 71e5fc7f0458f77e94879399a39e36393ed19409)
This commit is contained in:
parent
72152d84ed
commit
bd695feded
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user