mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-26 22:06:49 +00:00
Code Issues Releases Wiki Activity

Merge branch 'recall_how_to_recall' into 'master'

Browse source 
Prevent recursive calls to ActiveSpells::update

Closes #7022

See merge request OpenMW/openmw!2426
This commit is contained in:
psi29a 2022-09-25 13:30:07 +00:00
commit d38c072030
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/activespells.cpp
View file

@ -184,6 +184,8 @@ namespace MWMechanics
void ActiveSpells::update(const MWWorld::Ptr& ptr, float duration) void ActiveSpells::update(const MWWorld::Ptr& ptr, float duration)
{ {
if (mIterating)
return;
const auto& creatureStats = ptr.getClass().getCreatureStats(ptr); const auto& creatureStats = ptr.getClass().getCreatureStats(ptr);
assert(&creatureStats.getActiveSpells() == this); assert(&creatureStats.getActiveSpells() == this);
IterationGuard guard{ *this }; IterationGuard guard{ *this };