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, 56 insertions, 95 deletions

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index a02a8b1b..33f2f480 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -43,7 +43,6 @@
 #include "net/protocol.h"
 
 #include "resources/animation.h"
-#include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
@@ -97,10 +96,10 @@ LocalPlayer::~LocalPlayer()
 
     for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
     {
-        delete mTargetCursorInRange[i];
-        delete mTargetCursorOutRange[i];
-        mInRangeImages[i]->decRef();
-        mOutRangeImages[i]->decRef();
+        delete mTargetCursor[0][i];
+        delete mTargetCursor[1][i];
+        mTargetCursorImages[0][i]->decRef();
+        mTargetCursorImages[1][i]->decRef();
     }
 }
 
@@ -121,33 +120,32 @@ void LocalPlayer::logic()
 
         case WALK:
             mFrame = (get_elapsed_time(mWalkTime) * 6) / mWalkSpeed;
-            if (mFrame >= 6) {
+            if (mFrame >= 6)
                 nextStep();
-            }
             break;
 
         case ATTACK:
             int frames = 4;
-            if (    mEquippedWeapon
-                &&  mEquippedWeapon->getAttackType() == ACTION_ATTACK_BOW)
-            {
+            if (mEquippedWeapon &&
+                mEquippedWeapon->getAttackType() == ACTION_ATTACK_BOW)
                 frames = 5;
-            }
+
             mFrame = (get_elapsed_time(mWalkTime) * frames) / mAttackSpeed;
-            if (mFrame >= frames) {
+
+            if (mFrame >= frames)
                 nextStep();
-            }
+
             break;
     }
 
     // Actions are allowed once per second
-    if (get_elapsed_time(mLastAction) >= 1000) {
+    if (get_elapsed_time(mLastAction) >= 1000)
         mLastAction = -1;
-    }
+
     // Targeting allowed 4 times a second
-    if (get_elapsed_time(mLastTarget) >= 250) {
+    if (get_elapsed_time(mLastTarget) >= 250)
         mLastTarget = -1;
-    }
+
     // Remove target if its been on a being for more than a minute
     if (get_elapsed_time(mTargetTime) >= 60000)
     {
@@ -158,20 +156,20 @@ void LocalPlayer::logic()
 
     if (mTarget)
     {
+        // Find whether target is in range
+        const int rangeX = abs(mTarget->mX - mX);
+        const int rangeY = abs(mTarget->mY - mY);
+        const int attackRange = getAttackRange();
+        const int inRange = rangeX > attackRange || rangeY > attackRange ? 1 : 0;
+
+        mTarget->setTargetAnimation(
+            mTargetCursor[inRange][mTarget->getTargetCursorSize()]);
+
         if (mTarget->mAction == DEAD)
-        {
             stopAttack();
-        }
+
         if (mKeepAttacking && mTarget)
-        {
             attack(mTarget, true);
-        }
-
-        for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
-        {
-            player_node->mTargetCursorInRange[i]->update(10);
-            player_node->mTargetCursorOutRange[i]->update(10);
-        }
     }
 
     Being::logic();
@@ -194,13 +192,9 @@ void LocalPlayer::setName(const std::string &name)
     }
 
     if (config.getValue("showownname", false) && mMapInitialized)
-    {
         Player::setName(name);
-    }
     else
-    {
         Being::setName(name);
-    }
 }
 
 void LocalPlayer::nextStep()
@@ -208,15 +202,10 @@ void LocalPlayer::nextStep()
     if (mPath.empty())
     {
         if (mPickUpTarget)
-        {
             pickUp(mPickUpTarget);
-        }
 
         if (mWalkingDir)
-        {
             walk(mWalkingDir);
-        }
-
     }
 
     if (mGoingToTarget && mTarget && withinAttackRange(mTarget))
@@ -280,12 +269,15 @@ void LocalPlayer::pickUp(FloorItem *item)
     int dx = item->getX() - mX;
     int dy = item->getY() - mY;
 
-    if (dx * dx + dy * dy < 4) {
+    if (dx * dx + dy * dy < 4)
+    {
         MessageOut outMsg(mNetwork);
         outMsg.writeInt16(CMSG_ITEM_PICKUP);
         outMsg.writeInt32(item->getId());
         mPickUpTarget = NULL;
-    } else {
+    }
+    else
+    {
         setDestination(item->getX(), item->getY());
         mPickUpTarget = item;
         stopAttack();
@@ -341,27 +333,32 @@ void LocalPlayer::setTarget(Being *target)
 {
     if (mLastTarget != -1 || target == this)
         return;
+
     mLastTarget = tick_time;
 
-    if (!target || target == mTarget)
-    {
+    if (target == mTarget)
         target = NULL;
-        mKeepAttacking = false;
-        mTargetTime = -1;
-    }
-    if (target)
+
+    if (target || mAction == ATTACK)
     {
         mTargetTime = tick_time;
     }
-    if (mTarget && mTarget->getType() == Being::MONSTER)
+    else
     {
-        static_cast<Monster *>(mTarget)->showName(false);
+        mKeepAttacking = false;
+        mTargetTime = -1;
     }
+
+    if (mTarget)
+        mTarget->untarget();
+
+    if (mTarget && mTarget->getType() == Being::MONSTER)
+        static_cast<Monster *>(mTarget)->showName(false);
+
     mTarget = target;
+
     if (target && target->getType() == Being::MONSTER)
-    {
         static_cast<Monster *>(target)->showName(true);
-    }
 }
 
 void LocalPlayer::setDestination(Uint16 x, Uint16 y)
@@ -541,7 +538,8 @@ void LocalPlayer::attack(Being *target, bool keep)
         if (!soundFile.empty())
             sound.playSfx(soundFile);
     }
-    else {
+    else
+    {
         sound.playSfx("sfx/fist-swish.ogg");
     }
 
@@ -551,9 +549,7 @@ void LocalPlayer::attack(Being *target, bool keep)
     outMsg.writeInt8(0);
 
     if (!keep)
-    {
         stopAttack();
-    }
 }
 
 void LocalPlayer::stopAttack()
@@ -685,54 +681,19 @@ void LocalPlayer::loadTargetCursor(std::string filename, int width, int height,
 
     currentImageSet = resman->getImageSet(filename, width, height);
     Animation *anim = new Animation();
-    for (unsigned int i = 0; i < currentImageSet->size(); ++i)
-    {
-        anim->addFrame(currentImageSet->get(i), 75, 0, 0);
-    }
-    currentCursor = new SimpleAnimation(anim);
 
-    if (outRange)
-    {
-        mOutRangeImages[size] = currentImageSet;
-        mTargetCursorOutRange[size] = currentCursor;
-    }
-    else
+    for (unsigned int i = 0; i < currentImageSet->size(); ++i)
     {
-        mInRangeImages[size] = currentImageSet;
-        mTargetCursorInRange[size] = currentCursor;
+        anim->addFrame(currentImageSet->get(i), 75,
+                      (16 - (currentImageSet->getWidth() / 2)),
+                      (16 - (currentImageSet->getHeight() / 2)));
     }
-}
-
-void LocalPlayer::drawTargetCursor(Graphics *graphics, int scrollX, int scrollY)
-{
-
-    // Draw target marker if needed
-    if (mTarget)
-    {
-        // Calculate target circle position
-
-        // Find whether target is in range
-        int rangeX = abs(mTarget->mX - mX);
-        int rangeY = abs(mTarget->mY - mY);
-        int attackRange = getAttackRange();
 
-        // Get the correct target cursors graphic
-        TargetCursorSize cursorSize = mTarget->getTargetCursorSize();
-
-        if (rangeX > attackRange || rangeY > attackRange)
-        {
-            mTarget->mTargetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
-        }
-        else
-        {
-            mTarget->mTargetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
-        }
+    currentCursor = new SimpleAnimation(anim);
 
-        // Draw the target cursor at the correct position
-        int posX = mTarget->getPixelX() + 16 - mTarget->mTargetCursor->getWidth() / 2 - scrollX;
-        int posY = mTarget->getPixelY() + 16 - mTarget->mTargetCursor->getHeight() / 2 - scrollY;
+    const int index = outRange ? 1 : 0;
 
-        graphics->drawImage(mTarget->mTargetCursor, posX, posY);
-   }
-   return;
+    mTargetCursorImages[index][size] = currentImageSet;
+    mTargetCursor[index][size] = currentCursor;
 }
+