AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-12 14:01:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert some changes

Browse Source
This commit is contained in:
SkyHasACat 2025-08-01 16:40:30 -07:00
parent 64a45f8aeb
commit 5209685783
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwworld/esmstore.cpp
View File

@ -738,9 +738,9 @@ namespace MWWorld
case ESM::REC_LEVI: case ESM::REC_LEVI:
case ESM::REC_LEVC: case ESM::REC_LEVC:
case ESM::REC_LIGH: case ESM::REC_LIGH:
case ESM::REC_NPC_:
mStoreImp->mRecNameToStore[type]->read(reader); mStoreImp->mRecNameToStore[type]->read(reader);
return true; return true;
case ESM::REC_NPC_:
case ESM::REC_CREA: case ESM::REC_CREA:
case ESM::REC_CONT: case ESM::REC_CONT:
mStoreImp->mRecNameToStore[type]->read(reader, true); mStoreImp->mRecNameToStore[type]->read(reader, true);

14
apps/openmw/mwworld/store.cpp
View File

@ -269,13 +269,15 @@ namespace MWWorld
list.push_back((*it)->mId); list.push_back((*it)->mId);
} }
} }
template <typename T, typename Id> template <class T, class Id>
T* TypedDynamicStore<T, Id>::insert(const T& item, bool /*overrideOnly*/) T* TypedDynamicStore<T, Id>::insert(const T& item, bool overrideOnly)
{ {
// Check if the ID already exists in static or dynamic stores if (overrideOnly)
auto itStatic = mStatic.find(item.mId); {
auto itDynamic = mDynamic.find(item.mId); auto it = mStatic.find(item.mId);
if (it == mStatic.end())
return nullptr;
}
std::pair<typename Dynamic::iterator, bool> result = mDynamic.insert_or_assign(item.mId, item); std::pair<typename Dynamic::iterator, bool> result = mDynamic.insert_or_assign(item.mId, item);
T* ptr = &result.first->second; T* ptr = &result.first->second;
if (result.second) if (result.second)