From bfcfcecab6b750f954b46f70af7f5a1d678967b4 Mon Sep 17 00:00:00 2001
From: Star-Demon <starsickle@yahoo.com>
Date: Fri, 14 Jan 2011 09:52:28 -0500
Subject: [PATCH] Most of AutoMove finished - just needs some speed in Player
 class.

---
 apps/openmw/mwinput/inputmanager.cpp | 55 +++++++++++++++++++++-------
 apps/openmw/mwworld/player.hpp       | 25 +++++++++++++
 2 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanager.cpp b/apps/openmw/mwinput/inputmanager.cpp
index c93ce1611..c2c1f9655 100644
--- a/apps/openmw/mwinput/inputmanager.cpp
+++ b/apps/openmw/mwinput/inputmanager.cpp
@@ -87,6 +87,9 @@ namespace MWInput
     // Count screenshots.
     int shotCount;
 
+
+   /* InputImpl Methods */
+
     // Write screenshot to file.
     void screenshot()
     {
@@ -101,8 +104,8 @@ namespace MWInput
       ogre.screenshot(buf);
     }
 
-    // Called when the user presses the button to toggle the inventory
-    // screen.
+   
+    /* toggleInventory() is called when the user presses the button to toggle the inventory screen. */
     void toggleInventory()
     {
       using namespace MWGui;
@@ -137,6 +140,11 @@ namespace MWInput
         mEngine.activate();
     }
 
+    void toggleAutoMove() 
+    {
+	player.setmAutoMove(true);
+    }
+
     // Exit program now button (which is disabled in GUI mode)
     void exitNow()
     {
@@ -178,7 +186,8 @@ namespace MWInput
                        "Toggle console");
       disp->funcs.bind(A_Activate, boost::bind(&InputImpl::activate, this),
                        "Activate");
-
+      disp->funcs.bind(A_AutoMove, boost::bind(&InputImpl::toggleAUtoMove, this),
+                      "Auto Move");
 
       // Add the exit listener
       ogre.getRoot()->addFrameListener(&exit);
@@ -245,7 +254,7 @@ namespace MWInput
       poller.bind(A_MoveDown, KC_LCONTROL);
     }
 
-    // Used to check for movement keys
+    //NOTE: Used to check for movement keys
     bool frameStarted(const Ogre::FrameEvent &evt)
     {
       // Tell OIS to handle all input events
@@ -266,17 +275,35 @@ namespace MWInput
       float moveX = 0, moveY = 0, moveZ = 0;
      
 
-      //TODO: Where should I put bool isAutoMoving; ? 
-      //AUTO-MOVE condition
-	//Check Automove Toggle.
-	//If true...apply current MoveType speed to current direction
+      /*AUTO-MOVE*/
+      //TODO: double Check this.
+      //player.executeAutoMove((float)evt.timeSinceLastEvent); 
+ 
 
-      //If any other movement key is pressed, Toggle automove.
+      if(poller.isDown(A_MoveLeft)) 
+      { 
+        player.setmAutoMove(false);
+      	moveX -= speed;
+      }
+
+      if(poller.isDown(A_MoveRight)) 
+      { 
+      player.setmAutoMove(false);
+      moveX += speed;
+      }
+
+      if(poller.isDown(A_MoveForward))
+      { 
+          player.setmAutoMove(false); 
+          moveZ -= speed;
+      }
+
+      if(poller.isDown(A_MoveBackward))
+      { 
+	  player.setmAutoMove(false); 
+	  moveZ += speed;
+      }
 
-      if(poller.isDown(A_MoveLeft)) moveX -= speed;
-      if(poller.isDown(A_MoveRight)) moveX += speed;
-      if(poller.isDown(A_MoveForward)) moveZ -= speed;
-      if(poller.isDown(A_MoveBackward)) moveZ += speed;
 
       // TODO: These should be enabled for floating modes (like
       // swimming and levitation) and disabled for everything else.
@@ -319,6 +346,7 @@ namespace MWInput
     }
   };
 
+  /***CONSTRUCTOR***/
   MWInputManager::MWInputManager(OEngine::Render::OgreRenderer &ogre,
                                  MWWorld::Player &player,
                                  MWGui::WindowManager &windows,
@@ -328,6 +356,7 @@ namespace MWInput
     impl = new InputImpl(ogre,player,windows,debug, engine);
   }
 
+  /***DESTRUCTOR***/
   MWInputManager::~MWInputManager()
   {
     delete impl;
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 997282ca6..828c2082a 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -31,6 +31,8 @@ namespace MWWorld
         ESM::Class *mClass;
         bool mCollisionMode;
 
+	bool mAutoMove;
+
     public:
 
         Player(MWRender::Player *renderer, const ESM::NPC *player, MWWorld::World& world);
@@ -108,6 +110,29 @@ namespace MWWorld
         {
             mCollisionMode = !mCollisionMode;
         }
+
+	bool getmAutoMove() 
+        { 
+		return mAutoMove;
+	}
+
+	void setmAutoMove(bool setMe) 
+	{
+		mAutoMove = setMe;
+	}
+
+	/// <param name="duration">float value representing time since last call</param>
+	void executeAutoMove(float duration) 
+        {
+             if (this.mAutoMove == true) 
+	     {
+		//No code insight! ARGH!
+		//Z...? Forward is Z? /boggle
+		//player.setspeedZ() = speed * duration * -1;
+	     }
+	}
+
+
   };
 }
 #endif