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

Merge pull request #2554 from Capostrophic/summon

Browse Source 
Make sure summoned creatures are removed upon caster death (#5183)
This commit is contained in:
Andrei Kortunov 2019-10-11 20:06:16 +04:00 committed by GitHub
commit 67bef9a3a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,9 +86,10 @@ namespace MWMechanics
}
// Update summon effects
bool casterDead = creatureStats.isDead();
for (std::map<CreatureStats::SummonKey, int>::iterator it = creatureMap.begin(); it != creatureMap.end(); )
{
bool found = mActiveEffects.find(it->first) != mActiveEffects.end();
bool found = !casterDead && mActiveEffects.find(it->first) != mActiveEffects.end();
if (!found)
{
// Effect has ended