From 90aa8f9db62d2bc957d0793c142306afee95186a Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Thu, 31 Oct 2013 13:11:15 +0100 Subject: [PATCH] fixed dialogue record loading with multiple content files --- apps/opencs/model/world/data.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp index fc81287fe..d06840370 100644 --- a/apps/opencs/model/world/data.cpp +++ b/apps/opencs/model/world/data.cpp @@ -521,9 +521,8 @@ void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base) if (record.mType==ESM::Dialogue::Journal) { - int index = mJournals.getAppendIndex (id); mJournals.load (record, base); - dialogue = &mJournals.getRecord (index).get(); + dialogue = &mJournals.getRecord (id).get(); } else if (record.mType==ESM::Dialogue::Deleted) { @@ -545,9 +544,8 @@ void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base) } else { - int index = mTopics.getAppendIndex (id); mTopics.load (record, base); - dialogue = &mTopics.getRecord (index).get(); + dialogue = &mTopics.getRecord (id).get(); } break;