mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-16 08:42:23 +00:00
Code Issues Projects Releases Wiki Activity

Use extract/insert instead of erase/emplace

Browse Source 
When we call moveObject(), we might trigger a change of cell for the
actor, which in turn triggers updatePtr(). The erase/emplace
construct invalidate references, whereas extract/insert do not.

The reason is was working before !1075 is because we were always
"refreshing" the reference by a call to getActor().
This commit is contained in:
fredzio 2021-08-03 07:00:42 +02:00
parent 547bc4a252
commit bc738c5640
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/openmw/mwphysics/physicssystem.cpp
View File

@ -519,13 +519,12 @@ namespace MWPhysics
mObjects.emplace(updated, std::move(obj)); mObjects.emplace(updated, std::move(obj));
} }
ActorMap::iterator foundActor = mActors.find(old); auto actorNode = mActors.extract(old);
if (foundActor != mActors.end()) if (!actorNode.empty())
{ {
auto actor = foundActor->second; actorNode.key() = updated;
actor->updatePtr(updated); actorNode.mapped()->updatePtr(updated);
mActors.erase(foundActor); mActors.insert(std::move(actorNode));
mActors.emplace(updated, std::move(actor));
} }
for (auto& [_, actor] : mActors) for (auto& [_, actor] : mActors)