mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:23:51 +00:00
Code Issues Releases Wiki Activity

fix Store<T>::eraseStatic()

Browse source
This commit is contained in:
greye 2013-03-14 19:28:17 +04:00
parent 3d34fea21e
commit d30b38f336
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/openmw/mwworld/store.hpp
View file

@ -187,18 +187,17 @@ namespace MWWorld
T item; T item;
item.mId = Misc::StringUtils::lowerCase(id); item.mId = Misc::StringUtils::lowerCase(id);
// delete from the static part of mShared
typename std::vector<T *>::iterator sharedIter = mShared.begin();
for (; sharedIter != (mShared.begin()+mStatic.size()); ++sharedIter) {
if((*sharedIter)->mId == item.mId) {
mShared.erase(sharedIter);
break;
}
}
typename std::map<std::string, T>::iterator it = mStatic.find(item.mId); typename std::map<std::string, T>::iterator it = mStatic.find(item.mId);
if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) { if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) {
// delete from the static part of mShared
typename std::vector<T *>::iterator sharedIter = mShared.begin();
for (; sharedIter != (mShared.begin()+mStatic.size()); ++sharedIter) {
if((*sharedIter)->mId == item.mId) {
mShared.erase(sharedIter);
break;
}
}
mStatic.erase(it); mStatic.erase(it);
} }