AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-23 04:26:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28 from DreamWeave-MP/you-need-to-be-more-dynamic

Browse Source 
Fix(client): Override dynamic cell records as well, minor refactor for clarity
This commit is contained in:
Dave Corley 2023-09-29 07:15:38 -05:00 committed by GitHub
commit aee2ca980e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -801,8 +801,10 @@ namespace MWWorld
*/
ESM::Cell *Store<ESM::Cell>::override(const ESM::Cell &cell)
{
if (search(cell) != 0)
{
if (search(cell) == 0)
return insert(cell);
for (auto it = mSharedInt.begin(); it != mSharedInt.end(); ++it)
{
if (Misc::StringUtils::ciEqual((*it)->mName, cell.mName))
@ -820,12 +822,17 @@ namespace MWWorld
return &(*it).second;
}
}
}
else
for (auto it = mDynamicInt.begin(); it != mDynamicInt.end(); ++it)
{
return insert(cell);
if (Misc::StringUtils::ciEqual((*it).second.mName, cell.mName))
{
(*it).second = cell;
return &(*it).second;
}
}
return nullptr;
}
/*
End of tes3mp addition
*/