From a87fe71ddf643fc6231f3cb90a831ed76942187c Mon Sep 17 00:00:00 2001
From: Internecine <qhibkgv@shitmail.org>
Date: Sat, 27 Dec 2014 19:46:54 +1300
Subject: [PATCH] Added a helper function to handle dynamic stat changes

---
 apps/openmw/mwmechanics/spellcasting.cpp | 28 +++++++++---------------
 apps/openmw/mwmechanics/spellcasting.hpp |  2 ++
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index fd4c9406c..3ec52cf46 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -580,30 +580,15 @@ namespace MWMechanics
             }
             else if (effectId == ESM::MagicEffect::DamageHealth || effectId == ESM::MagicEffect::RestoreHealth)
             {
-                MWMechanics::DynamicStat<float> health = target.getClass().getCreatureStats(target).getHealth();
-                if (effectId == ESM::MagicEffect::DamageHealth)
-                    health.setCurrent(health.getCurrent() - magnitude);
-                else
-                    health.setCurrent(health.getCurrent() + magnitude);
-                target.getClass().getCreatureStats(target).setHealth(health);
+                applyDynamicStatsEffect(0, target, magnitude);
             }
             else if (effectId == ESM::MagicEffect::DamageFatigue || effectId == ESM::MagicEffect::RestoreFatigue)
             {
-                MWMechanics::DynamicStat<float> fatigue = target.getClass().getCreatureStats(target).getFatigue();
-                if (effectId == ESM::MagicEffect::DamageFatigue)
-                    fatigue.setCurrent(fatigue.getCurrent() - magnitude);
-                else
-                    fatigue.setCurrent(fatigue.getCurrent() + magnitude);
-                target.getClass().getCreatureStats(target).setHealth(fatigue);
+                applyDynamicStatsEffect(1, target, magnitude);
             }
             else if (effectId == ESM::MagicEffect::DamageMagicka || effectId == ESM::MagicEffect::RestoreMagicka)
             {
-                MWMechanics::DynamicStat<float> magicka = target.getClass().getCreatureStats(target).getMagicka();
-                if (effectId == ESM::MagicEffect::DamageMagicka)
-                    magicka.setCurrent(magicka.getCurrent() - magnitude);
-                else
-                    magicka.setCurrent(magicka.getCurrent() + magnitude);
-                target.getClass().getCreatureStats(target).setHealth(magicka);
+                applyDynamicStatsEffect(2, target, magnitude);
             }
             else if (effectId == ESM::MagicEffect::DamageSkill || effectId == ESM::MagicEffect::RestoreSkill)
             {
@@ -666,6 +651,13 @@ namespace MWMechanics
             }
         }
     }
+    
+    void CastSpell::applyDynamicStatsEffect(int attribute, const MWWorld::Ptr& target, float magnitude)
+    {
+        DynamicStat<float> value = target.getClass().getCreatureStats(target).getDynamic(attribute);
+        value.modify(magnitude);
+        target.getClass().getCreatureStats(target).setDynamic(attribute, value);
+    }
 
     bool CastSpell::cast(const std::string &id)
     {
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 395ae043b..d76478146 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -93,6 +93,8 @@ namespace MWMechanics
 
         /// @note \a caster can be any type of object, or even an empty object.
         void applyInstantEffect (const MWWorld::Ptr& target, const MWWorld::Ptr& caster, const MWMechanics::EffectKey& effect, float magnitude);
+        
+        void applyDynamicStatsEffect (int attribute, const MWWorld::Ptr& target, float magnitude);
     };
 
 }