Merged 0.0 changes from revision 3234 to 3317 to trunk.

1 files changed, 15 insertions, 5 deletions

diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 84efeff3..22d0f249 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -29,9 +29,9 @@
 #include "windowcontainer.h"
 
 #include "../configlistener.h"
+#include "../being.h"
 
 class Map;
-class Being;
 class FloorItem;
 class ImageSet;
 class Item;
@@ -142,6 +142,13 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         void showPopup(int x, int y, Being *being);
 
         /**
+         * Helper function for loading target cursors
+         */
+        void
+        loadTargetCursor(std::string filename, int width, int height,
+                         bool outRange, Being::TargetCursorSize size);
+
+        /**
          * Draws range based target cursor
          */
         void
@@ -164,14 +171,17 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         int mCameraY;              /**< Current viewpoint in tiles. */
         bool mShowDebugPath;       /**< Show a path from player to pointer. */
 
-        ImageSet *mInRangeImages;  /**< Images of in range target cursor. */
-        ImageSet *mOutRangeImages; /**< Images of out of range target cursor.*/
+        /** Images of in range target cursor. */
+        ImageSet *mInRangeImages[Being::NUM_TC];
+
+        /** Images of out of range target cursor. */
+        ImageSet *mOutRangeImages[Being::NUM_TC];
 
         /** Animated in range target cursor. */
-        SimpleAnimation *mTargetCursorInRange;
+        SimpleAnimation *mTargetCursorInRange[Being::NUM_TC];
 
         /** Animated out of range target cursor. */
-        SimpleAnimation *mTargetCursorOutRange;
+        SimpleAnimation *mTargetCursorOutRange[Being::NUM_TC];
 
         bool mPlayerFollowMouse;
         int mWalkTime;