mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 19:45:40 +00:00
Code Issues Releases Wiki Activity

Optimized dialogue merging with a lookup map

Browse source
This commit is contained in:
scrawl 2014-05-18 15:59:45 +02:00
parent 1677fcf324
commit 0aa1042fd7
2 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
components/esm/loaddial.cpp
View file

@ -47,37 +47,46 @@ void Dialogue::save(ESMWriter &esm) const
void Dialogue::addInfo(const ESM::DialInfo& info, bool merge) void Dialogue::addInfo(const ESM::DialInfo& info, bool merge)
{ {
// TODO: use std::move
if (!merge || mInfo.empty() || info.mNext.empty()) if (!merge || mInfo.empty() || info.mNext.empty())
{ {
mInfo.push_back(info); mLookup[info.mId] = mInfo.insert(mInfo.end(), info);
return; return;
} }
if (info.mPrev.empty()) if (info.mPrev.empty())
{ {
mInfo.push_front(info); mLookup[info.mId] = mInfo.insert(mInfo.begin(), info);
return; return;
} }
int i=0;
for (ESM::Dialogue::InfoContainer::iterator it = mInfo.begin(); it != mInfo.end(); ++it) ESM::Dialogue::InfoContainer::iterator it = mInfo.end();
std::map<std::string, ESM::Dialogue::InfoContainer::iterator>::iterator lookup;
lookup = mLookup.find(info.mPrev);
if (lookup != mLookup.end())
{ {
if (info.mPrev == it->mId) it = lookup->second;
{
mInfo.insert(++it, info); mLookup[info.mId] = mInfo.insert(++it, info);
return; return;
}
if (info.mNext == it->mId)
{
mInfo.insert(it, info);
return;
}
if (info.mId == it->mId)
{
*it = info;
return;
}
++i;
} }
lookup = mLookup.find(info.mNext);
if (lookup != mLookup.end())
{
it = lookup->second;
mLookup[info.mId] = mInfo.insert(it, info);
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;
} }

6
components/esm/loaddial.hpp
View file

@ -3,6 +3,7 @@
#include <string> #include <string>
#include <list> #include <list>
#include <map>
#include "loadinfo.hpp" #include "loadinfo.hpp"
@ -36,8 +37,13 @@ struct Dialogue
typedef std::list<DialInfo> InfoContainer; typedef std::list<DialInfo> InfoContainer;
typedef std::map<std::string, InfoContainer::iterator> LookupMap;
InfoContainer mInfo; InfoContainer mInfo;
// This is only used during the loading phase to speed up DialInfo merging.
LookupMap mLookup;
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;