From e56ff9283dfa6849ebb9caeb6758065ff39a5cc6 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 17 May 2012 13:21:49 +0200
Subject: [PATCH] Issue #256: moved magic effects update from MechanicsManager
 to Actors

---
 apps/openmw/mwmechanics/actors.cpp           | 20 +++++++++++++++++++-
 apps/openmw/mwmechanics/actors.hpp           |  2 ++
 apps/openmw/mwmechanics/mechanicsmanager.cpp | 18 ------------------
 apps/openmw/mwmechanics/mechanicsmanager.hpp |  2 --
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index d7e879b229..b0bb1e3ef9 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -14,7 +14,10 @@ namespace MWMechanics
 {
     void Actors::updateActor (const MWWorld::Ptr& ptr, float duration)
     {
-        MWMechanics::CreatureStats& creatureStats = MWWorld::Class::get (ptr).getCreatureStats (ptr);
+        // magic effects
+        adjustMagicEffects (ptr);
+
+        CreatureStats& creatureStats = MWWorld::Class::get (ptr).getCreatureStats (ptr);
 
         // calculate dynamic stats
         int strength = creatureStats.mAttributes[0].getBase();
@@ -41,6 +44,21 @@ namespace MWMechanics
                 MWWorld::Class::get (ptr).getNpcStats (ptr));
     }
 
+    void Actors::adjustMagicEffects (const MWWorld::Ptr& creature)
+    {
+        CreatureStats& creatureStats =  MWWorld::Class::get (creature).getCreatureStats (creature);
+
+        MagicEffects now = creatureStats.mSpells.getMagicEffects();
+
+        /// \todo add effects from active spells and equipment
+
+        MagicEffects diff = MagicEffects::diff (creatureStats.mMagicEffects, now);
+
+        creatureStats.mMagicEffects = now;
+
+        // TODO apply diff to other stats
+    }
+
     Actors::Actors() : mDuration (0) {}
 
     void Actors::addActor (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index ae93fb52ee..37a00deecc 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -23,6 +23,8 @@ namespace MWMechanics
 
             void updateNpc (const MWWorld::Ptr& ptr, float duration, bool paused);
 
+            void adjustMagicEffects (const MWWorld::Ptr& creature);
+
         public:
 
             Actors();
diff --git a/apps/openmw/mwmechanics/mechanicsmanager.cpp b/apps/openmw/mwmechanics/mechanicsmanager.cpp
index 073604b015..66a850b051 100644
--- a/apps/openmw/mwmechanics/mechanicsmanager.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanager.cpp
@@ -138,26 +138,8 @@ namespace MWMechanics
                 }
             }
         }
-
-        // magic effects
-        adjustMagicEffects (ptr);
     }
 
-    void MechanicsManager::adjustMagicEffects (MWWorld::Ptr& creature)
-    {
-        MWMechanics::CreatureStats& creatureStats =
-            MWWorld::Class::get (creature).getCreatureStats (creature);
-
-        MagicEffects now = creatureStats.mSpells.getMagicEffects();
-
-        /// \todo add effects from active spells and equipment
-
-        MagicEffects diff = MagicEffects::diff (creatureStats.mMagicEffects, now);
-
-        creatureStats.mMagicEffects = now;
-
-        // TODO apply diff to other stats
-    }
 
     MechanicsManager::MechanicsManager()
     : mUpdatePlayer (true), mClassSelected (false),
diff --git a/apps/openmw/mwmechanics/mechanicsmanager.hpp b/apps/openmw/mwmechanics/mechanicsmanager.hpp
index a26fb98cd9..62bb4cf7e2 100644
--- a/apps/openmw/mwmechanics/mechanicsmanager.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanager.hpp
@@ -31,8 +31,6 @@ namespace MWMechanics
             ///< build player according to stored class/race/birthsign information. Will
             /// default to the values of the ESM::NPC object, if no explicit information is given.
 
-            void adjustMagicEffects (MWWorld::Ptr& creature);
-
         public:
 
             MechanicsManager ();