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

Merge remote-tracking branch 'scrawl/master'

Browse Source
This commit is contained in:
Marc Zinnschlag 2014-05-18 19:03:35 +02:00
commit 1294682196
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/esm/loaddial.cpp
View File

@ -61,6 +61,15 @@ void Dialogue::addInfo(const ESM::DialInfo& info, bool merge)
ESM::Dialogue::InfoContainer::iterator it = mInfo.end(); ESM::Dialogue::InfoContainer::iterator it = mInfo.end();
std::map<std::string, ESM::Dialogue::InfoContainer::iterator>::iterator lookup; std::map<std::string, ESM::Dialogue::InfoContainer::iterator>::iterator lookup;
lookup = mLookup.find(info.mId);
if (lookup != mLookup.end())
{
it = lookup->second;
*it = info;
return;
}
lookup = mLookup.find(info.mPrev); lookup = mLookup.find(info.mPrev);
if (lookup != mLookup.end()) if (lookup != mLookup.end())
{ {
@ -79,14 +88,6 @@ void Dialogue::addInfo(const ESM::DialInfo& info, bool merge)
return; return;
} }
lookup = mLookup.find(info.mId);
if (lookup != mLookup.end())
{
it = lookup->second;
*it = info;
return;
}
std::cerr << "Failed to insert info " << info.mId << std::endl; std::cerr << "Failed to insert info " << info.mId << std::endl;
} }