krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Avoid unnecessary multimap copies

Browse source
This commit is contained in:
Chris Robinson 2013-04-23 21:42:59 -07:00
parent 512ff3687a
commit 6f0b9a5f2c
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/nifogre/ogrenifloader.cpp
View file

@ -676,9 +676,8 @@ class NIFObjectLoader
} }
static TextKeyMap extractTextKeys(const Nif::NiTextKeyExtraData *tk) static void extractTextKeys(const Nif::NiTextKeyExtraData *tk, TextKeyMap &textkeys)
{ {
TextKeyMap textkeys;
for(size_t i = 0;i < tk->list.size();i++) for(size_t i = 0;i < tk->list.size();i++)
{ {
const std::string &str = tk->list[i].text; const std::string &str = tk->list[i].text;
@ -698,7 +697,6 @@ class NIFObjectLoader
pos = nextpos; pos = nextpos;
} }
} }
return textkeys;
} }
@ -730,7 +728,7 @@ class NIFObjectLoader
const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr()); const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr());
int trgtid = NIFSkeletonLoader::lookupOgreBoneHandle(name, node->recIndex); int trgtid = NIFSkeletonLoader::lookupOgreBoneHandle(name, node->recIndex);
objectlist.mTextKeys[trgtid] = extractTextKeys(tk); extractTextKeys(tk, objectlist.mTextKeys[trgtid]);
} }
else if(e->recType == Nif::RC_NiStringExtraData) else if(e->recType == Nif::RC_NiStringExtraData)
{ {