Merged the movement branch into trunk

I consider this the only way forward. In my tests this code isn't actually
doing worse than what was there before. Of course some cases are a bit broken,
and I'm open to any kind of feedback so that we can fix those issues.

1 files changed, 8 insertions, 3 deletions

diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 82587938..5dedcea8 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -145,9 +145,10 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
 
     private:
         /**
-         * Helper function for loading target cursors
+         * Helper function for loading target cursors.
          */
-        void loadTargetCursor(std::string filename, int width, int height,
+        void loadTargetCursor(const std::string &filename,
+                              int width, int height,
                               bool outRange, Being::TargetCursorSize size);
 
         /**
@@ -166,6 +167,11 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
          */
         void drawDebugPath(Graphics *graphics);
 
+        /**
+         * Draws the given path.
+         */
+        void drawPath(Graphics *graphics, const Path &path);
+
 
         Map *mMap;                 /**< The current map. */
 
@@ -191,7 +197,6 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         SimpleAnimation *mTargetCursorOutRange[Being::NUM_TC];
 
         bool mPlayerFollowMouse;
-        int mWalkTime;
         int mLocalWalkTime; /**< Timestamp before the next walk can be sent. */
 
         PopupMenu *mPopupMenu;     /**< Popup menu. */