mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-17 01:10:10 +00:00
Code Issues Projects Releases Wiki Activity

Prevent iterator invalidation when cleaning up summons

Browse Source
This commit is contained in:
Evil Eye 2021-08-28 11:06:47 +02:00
parent dc1fe62dde
commit 161e042e2a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwgui/container.cpp
View File

@ -277,8 +277,9 @@ namespace MWGui
auto it = std::find_if(summons.begin(), summons.end(), [&] (const auto& entry) { return entry.second == creatureStats.getActorId(); }); auto it = std::find_if(summons.begin(), summons.end(), [&] (const auto& entry) { return entry.second == creatureStats.getActorId(); });
if(it != summons.end()) if(it != summons.end())
{ {
MWMechanics::purgeSummonEffect(summoner, *it); auto summon = *it;
summons.erase(it); summons.erase(it);
MWMechanics::purgeSummonEffect(summoner, summon);
break; break;
} }
} }

3
apps/openmw/mwmechanics/summoning.cpp
View File

@ -125,8 +125,9 @@ namespace MWMechanics
if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished()) if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished())
{ {
// Purge the magic effect so a new creature can be summoned if desired // Purge the magic effect so a new creature can be summoned if desired
purgeSummonEffect(summoner, *it); auto summon = *it;
creatureMap.erase(it++); creatureMap.erase(it++);
purgeSummonEffect(summoner, summon);
} }
else else
++it; ++it;