mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-13 21:09:39 +00:00
Code Issues Releases Wiki Activity

fixed dialogue record loading with multiple content files

Browse source
This commit is contained in:
Marc Zinnschlag 2013-10-31 13:11:15 +01:00
parent 767cb54e7c
commit 90aa8f9db6
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/opencs/model/world/data.cpp
View file

@ -521,9 +521,8 @@ void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base)
if (record.mType==ESM::Dialogue::Journal) if (record.mType==ESM::Dialogue::Journal)
{ {
int index = mJournals.getAppendIndex (id);
mJournals.load (record, base); mJournals.load (record, base);
dialogue = &mJournals.getRecord (index).get(); dialogue = &mJournals.getRecord (id).get();
} }
else if (record.mType==ESM::Dialogue::Deleted) else if (record.mType==ESM::Dialogue::Deleted)
{ {
@ -545,9 +544,8 @@ void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base)
} }
else else
{ {
int index = mTopics.getAppendIndex (id);
mTopics.load (record, base); mTopics.load (record, base);
dialogue = &mTopics.getRecord (index).get(); dialogue = &mTopics.getRecord (id).get();
} }
break; break;