From 0892df0ad38ca0eddf0da8b0c46ba7676f4dc0a1 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 30 Mar 2012 17:01:55 +0200
Subject: [PATCH] framework for gamemechanics-realted actor updated

---
 apps/openmw/engine.cpp                       |  5 +--
 apps/openmw/mwmechanics/actors.cpp           | 34 ++++++++++++++++++--
 apps/openmw/mwmechanics/actors.hpp           | 12 +++++--
 apps/openmw/mwmechanics/mechanicsmanager.cpp |  5 +--
 apps/openmw/mwmechanics/mechanicsmanager.hpp |  6 +++-
 5 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 441c227699..45ed0abd45 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -148,7 +148,8 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
 
         // update actors
         std::vector<std::pair<std::string, Ogre::Vector3> > movement;
-        mEnvironment.mMechanicsManager->update (movement);
+        mEnvironment.mMechanicsManager->update (movement, mEnvironment.mFrameDuration,
+            mEnvironment.mWindowManager->getMode()!=MWGui::GM_Game);
 
         if (mEnvironment.mWindowManager->getMode()==MWGui::GM_Game)
             mEnvironment.mWorld->doPhysics (movement, mEnvironment.mFrameDuration);
@@ -317,7 +318,7 @@ void OMW::Engine::go()
     // to find core.xml here.
 
     //addResourcesDirectory(mResDir);
-   
+
     addResourcesDirectory(mResDir / "mygui");
     addResourcesDirectory(mResDir / "water");
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index e4fba8a9c4..d532c6f091 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1,11 +1,25 @@
 
 #include "actors.hpp"
 
+#include <typeinfo>
+
+#include <components/esm/loadnpc.hpp>
+
 #include "../mwworld/class.hpp"
 
 namespace MWMechanics
 {
-    Actors::Actors (MWWorld::Environment& environment) : mEnvironment (environment) {}
+    void Actors::updateActor (const MWWorld::Ptr& ptr, float duration)
+    {
+
+    }
+
+    void Actors::updateNpc (const MWWorld::Ptr& ptr, float duration, bool paused)
+    {
+
+    }
+
+    Actors::Actors (MWWorld::Environment& environment) : mEnvironment (environment), mDuration (0) {}
 
     void Actors::addActor (const MWWorld::Ptr& ptr)
     {
@@ -30,8 +44,24 @@ namespace MWMechanics
                 ++iter;
     }
 
-    void Actors::update (std::vector<std::pair<std::string, Ogre::Vector3> >& movement)
+    void Actors::update (std::vector<std::pair<std::string, Ogre::Vector3> >& movement, float duration,
+        bool paused)
     {
+        mDuration += duration;
+
+        if (mDuration>=0.25)
+        {
+            for (std::set<MWWorld::Ptr>::iterator iter (mActors.begin()); iter!=mActors.end(); ++iter)
+            {
+                updateActor (*iter, mDuration);
+
+                if (iter->getTypeName()==typeid (ESM::NPC).name())
+                    updateNpc (*iter, mDuration, paused);
+            }
+
+            mDuration = 0;
+        }
+
         for (std::set<MWWorld::Ptr>::iterator iter (mActors.begin()); iter!=mActors.end();
             ++iter)
         {
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index d3a3724726..7ff33b63bd 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -21,8 +21,13 @@ namespace MWMechanics
 {
     class Actors
     {
-           MWWorld::Environment& mEnvironment;
-           std::set<MWWorld::Ptr> mActors;
+            MWWorld::Environment& mEnvironment;
+            std::set<MWWorld::Ptr> mActors;
+            float mDuration;
+
+            void updateActor (const MWWorld::Ptr& ptr, float duration);
+
+            void updateNpc (const MWWorld::Ptr& ptr, float duration, bool paused);
 
         public:
 
@@ -37,7 +42,8 @@ namespace MWMechanics
             void dropActors (const MWWorld::Ptr::CellStore *cellStore);
             ///< Deregister all actors in the given cell.
 
-            void update (std::vector<std::pair<std::string, Ogre::Vector3> >& movement);
+            void update (std::vector<std::pair<std::string, Ogre::Vector3> >& movement,
+                float duration, bool paused);
             ///< Update actor stats and store desired velocity vectors in \a movement
     };
 }
diff --git a/apps/openmw/mwmechanics/mechanicsmanager.cpp b/apps/openmw/mwmechanics/mechanicsmanager.cpp
index f669ea65ce..3c93857ef9 100644
--- a/apps/openmw/mwmechanics/mechanicsmanager.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanager.cpp
@@ -253,7 +253,8 @@ namespace MWMechanics
         mWatched = ptr;
     }
 
-    void MechanicsManager::update (std::vector<std::pair<std::string, Ogre::Vector3> >& movement)
+    void MechanicsManager::update (std::vector<std::pair<std::string, Ogre::Vector3> >& movement,
+        float duration, bool paused)
     {
         if (!mWatched.isEmpty())
         {
@@ -336,7 +337,7 @@ namespace MWMechanics
             mEnvironment.mWindowManager->configureSkills (majorSkills, minorSkills);
         }
 
-        mActors.update (movement);
+        mActors.update (movement, duration, paused);
     }
 
     void MechanicsManager::setPlayerName (const std::string& name)
diff --git a/apps/openmw/mwmechanics/mechanicsmanager.hpp b/apps/openmw/mwmechanics/mechanicsmanager.hpp
index bf0a6215a1..a7defe178a 100644
--- a/apps/openmw/mwmechanics/mechanicsmanager.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanager.hpp
@@ -60,8 +60,12 @@ namespace MWMechanics
             ///< On each update look for changes in a previously registered actor and update the
             /// GUI accordingly.
 
-            void update (std::vector<std::pair<std::string, Ogre::Vector3> >& movement);
+            void update (std::vector<std::pair<std::string, Ogre::Vector3> >& movement, float duration,
+                bool paused);
             ///< Update actor stats and store desired velocity vectors in \a movement
+            ///
+            /// \param paused In game type does not currently advance (this usually means some GUI
+            /// component is up).
 
             void setPlayerName (const std::string& name);
             ///< Set player name.