From a54bc364bac208cc3c6101067563e92029955936 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Mon, 2 Dec 2019 00:27:33 +0200 Subject: [PATCH] [Client] Fix code conflict with OpenMW in OpRemoveSpell correctly --- apps/openmw/mwscript/statsextensions.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp index f0b3ef95e..1871d5475 100644 --- a/apps/openmw/mwscript/statsextensions.cpp +++ b/apps/openmw/mwscript/statsextensions.cpp @@ -519,7 +519,8 @@ namespace MWScript Send an ID_PLAYER_SPELLBOOK packet every time a player loses a spell here */ - MWMechanics::Spells &spells = ptr.getClass().getCreatureStats(ptr).getSpells(); + MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr); + MWMechanics::Spells &spells = creatureStats.getSpells(); if (spells.hasSpell(id)) { @@ -533,7 +534,7 @@ namespace MWScript creatureStats.getSpells().purgeEffect(effect.first.mId); } - ptr.getClass().getCreatureStats(ptr).getSpells().remove(id); + creatureStats.getSpells().remove (id); if (ptr == MWMechanics::getPlayer()) {