Merge pull request #3026 from akortunov/iterator

Rework cure effects

apps/openmw/mwmechanics/actors.cpp

@@ -916,12 +916,54 @@ namespace MWMechanics
             }
     };
 
+    void Actors::applyCureEffects(const MWWorld::Ptr& actor)
+    {
+        CreatureStats &creatureStats = actor.getClass().getCreatureStats(actor);
+        const MagicEffects &effects = creatureStats.getMagicEffects();
+
+        if (effects.get(ESM::MagicEffect::CurePoison).getModifier() > 0)
+        {
+            creatureStats.getActiveSpells().purgeEffect(ESM::MagicEffect::Poison);
+            creatureStats.getSpells().purgeEffect(ESM::MagicEffect::Poison);
+            if (actor.getClass().hasInventoryStore(actor))
+                actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Poison);
+        }
+        else if (effects.get(ESM::MagicEffect::CureParalyzation).getModifier() > 0)
+        {
+            creatureStats.getActiveSpells().purgeEffect(ESM::MagicEffect::Paralyze);
+            creatureStats.getSpells().purgeEffect(ESM::MagicEffect::Paralyze);
+            if (actor.getClass().hasInventoryStore(actor))
+                actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Paralyze);
+        }
+        else if (effects.get(ESM::MagicEffect::CureCommonDisease).getModifier() > 0)
+        {
+            creatureStats.getSpells().purgeCommonDisease();
+        }
+        else if (effects.get(ESM::MagicEffect::CureBlightDisease).getModifier() > 0)
+        {
+            creatureStats.getSpells().purgeBlightDisease();
+        }
+        else if (effects.get(ESM::MagicEffect::CureCorprusDisease).getModifier() > 0)
+        {
+            creatureStats.getActiveSpells().purgeCorprusDisease();
+            creatureStats.getSpells().purgeCorprusDisease();
+            if (actor.getClass().hasInventoryStore(actor))
+                actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Corprus, true);
+        }
+        else if (effects.get(ESM::MagicEffect::RemoveCurse).getModifier() > 0)
+        {
+            creatureStats.getSpells().purgeCurses();
+        }
+    }
+
     void Actors::calculateCreatureStatModifiers (const MWWorld::Ptr& ptr, float duration)
     {
         CreatureStats &creatureStats = ptr.getClass().getCreatureStats(ptr);
         const MagicEffects &effects = creatureStats.getMagicEffects();
         bool godmode = ptr == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
 
+        applyCureEffects(ptr);
+
         bool wasDead = creatureStats.isDead();
 
         if (duration > 0)

apps/openmw/mwmechanics/actors.hpp

@@ -206,6 +206,7 @@ namespace MWMechanics
 
     private:
         void updateVisibility (const MWWorld::Ptr& ptr, CharacterController* ctrl);
+        void applyCureEffects (const MWWorld::Ptr& actor);
 
         PtrActorMap mActors;
         float mTimerDisposeSummonsCorpses;

apps/openmw/mwmechanics/spellcasting.cpp

@@ -381,37 +381,6 @@ namespace MWMechanics
             target.getClass().getCreatureStats(target).getActiveSpells().purgeAll(magnitude, true);
             return true;
         }
-        else if (target.getClass().isActor() && effectId == ESM::MagicEffect::CurePoison)
-        {
-            target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(ESM::MagicEffect::Poison);
-            return true;
-        }
-        else if (target.getClass().isActor() && effectId == ESM::MagicEffect::CureParalyzation)
-        {
-            target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(ESM::MagicEffect::Paralyze);
-            return true;
-        }
-        else if (target.getClass().isActor() && effectId == ESM::MagicEffect::CureCommonDisease)
-        {
-            target.getClass().getCreatureStats(target).getSpells().purgeCommonDisease();
-            return true;
-        }
-        else if (target.getClass().isActor() && effectId == ESM::MagicEffect::CureBlightDisease)
-        {
-            target.getClass().getCreatureStats(target).getSpells().purgeBlightDisease();
-            return true;
-        }
-        else if (target.getClass().isActor() && effectId == ESM::MagicEffect::CureCorprusDisease)
-        {
-            target.getClass().getCreatureStats(target).getActiveSpells().purgeCorprusDisease();
-            target.getClass().getCreatureStats(target).getSpells().purgeCorprusDisease();
-            return true;
-        }
-        else if (target.getClass().isActor() && effectId == ESM::MagicEffect::RemoveCurse)
-        {
-            target.getClass().getCreatureStats(target).getSpells().purgeCurses();
-            return true;
-        }
         else if (target.getClass().isActor() && target == getPlayer())
         {
             MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mCaster);