Merge commit 'aethyra/master'

Conflicts:
	CMakeLists.txt
	configure.ac
	data/help/header.txt
	packaging/windows/setup.nsi
	po/POTFILES.in
	src/being.cpp
	src/being.h
	src/game.cpp
	src/gui/color.cpp
	src/gui/color.h
	src/gui/equipmentwindow.h
	src/gui/popupmenu.cpp
	src/gui/recorder.cpp
	src/gui/setup_colors.h
	src/gui/setup_keyboard.cpp
	src/gui/setup_keyboard.h
	src/gui/skill.cpp
	src/gui/speechbubble.cpp
	src/gui/speechbubble.h
	src/gui/table.cpp
	src/keyboardconfig.cpp
	src/keyboardconfig.h
	src/localplayer.cpp
	src/main.cpp
	src/main.h
	src/map.cpp
	src/resources/colordb.cpp
	src/resources/colordb.h
	src/resources/emotedb.cpp
	src/resources/emotedb.h
	src/text.cpp
	src/text.h
	src/tmw.rc
	src/winver.h

1 files changed, 7 insertions, 16 deletions

diff --git a/src/localplayer.h b/src/localplayer.h
index c128f4a4..4d0a05be 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -40,7 +40,6 @@ class Inventory;
 class Item;
 class Map;
 class Network;
-class SimpleAnimation;
 
 /**
  * The local player character.
@@ -232,14 +231,6 @@ class LocalPlayer : public Player
 
         float mLastAttackTime; /**< Used to synchronize the charge dialog */
 
-        void drawTargetCursor(Graphics *graphics, int offsetX, int offsetY);
-
-        /** Animated in range target cursor. */
-        SimpleAnimation *mTargetCursorInRange[NUM_TC];
-
-        /** Animated out of range target cursor. */
-        SimpleAnimation *mTargetCursorOutRange[NUM_TC];
-
         const std::auto_ptr<Equipment> mEquipment;
 
     protected:
@@ -270,20 +261,20 @@ class LocalPlayer : public Player
         Inventory *mInventory;
         Inventory *mStorage;
 
+        // Load the target cursors into memory
+        void initTargetCursor();
+
         /**
          * Helper function for loading target cursors
          */
         void loadTargetCursor(std::string filename, int width, int height,
                               bool outRange, Being::TargetCursorSize size);
 
-        /** Images of in range target cursor. */
-        ImageSet *mInRangeImages[NUM_TC];
-
-        /** Images of out of range target cursor. */
-        ImageSet *mOutRangeImages[NUM_TC];
+        /** Images of the target cursor. */
+        ImageSet *mTargetCursorImages[2][NUM_TC];
 
-        // Load the target cursors into memory
-        void initTargetCursor();
+        /** Animated target cursors. */
+        SimpleAnimation *mTargetCursor[2][NUM_TC];
 };
 
 extern LocalPlayer *player_node;