mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Merge remote-tracking branch 'scrawl/master'
This commit is contained in:
commit
1294682196
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user