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, 23 insertions, 0 deletions

diff --git a/src/being.h b/src/being.h
index 3c3a9b73..ef830e3a 100644
--- a/src/being.h
+++ b/src/being.h
@@ -50,6 +50,7 @@ class Map;
 class Graphics;
 class Particle;
 class Position;
+class SimpleAnimation;
 class SpeechBubble;
 class Text;
 
@@ -114,6 +115,15 @@ class Being : public Sprite
             NUM_TC
         };
 
+        enum Speech
+        {
+            NO_SPEECH = 0,
+            TEXT_OVERHEAD,
+            NO_NAME_IN_BUBBLE,
+            NAME_IN_BUBBLE,
+            NUM_SPEECH
+        };
+
         /**
          * Directions, to be used as bitmask values
          */
@@ -364,6 +374,16 @@ class Being : public Sprite
          */
         void controlParticle(Particle *particle);
 
+        /**
+         * Sets the target animation for this being.
+         */
+        void setTargetAnimation(SimpleAnimation* animation);
+
+        /**
+         * Untargets the being
+         */
+        void untarget() { mUsedTargetCursor = NULL; }
+
         AnimatedSprite* getEmote(int index) { return emotionSet[index]; }
 
         void setEmote(Uint8 emotion, Uint8 emote_time)
@@ -503,6 +523,9 @@ class Being : public Sprite
         // Speech Bubble components
         SpeechBubble *mSpeechBubble;
 
+        // Target cursor being used
+        SimpleAnimation* mUsedTargetCursor;
+
         static int instances;                              /**< Number of Being instances */
         static std::vector<AnimatedSprite*> emotionSet;    /**< Emoticons used by beings */
 };