From 6ca3e7e52584261f9d43de1a68c09f20a762cac1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 13 Mar 2016 19:14:04 +0300
Subject: Move cursor drawing function from ActorSprite into Being.

---
 src/being/being.cpp | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'src/being/being.cpp')

diff --git a/src/being/being.cpp b/src/being/being.cpp
index b37db6c62..80561eabf 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2859,7 +2859,7 @@ void Being::drawPlayer(Graphics *restrict const graphics,
                     py + mHorseInfo->downOffsetY);
             }
 
-            ActorSprite::draw1(graphics, px, py);
+            drawBeingCursor(graphics, px, py);
             drawSpriteAt(graphics, px, py);
 
             for_each_horses(mUpHorseSprites)
@@ -2871,16 +2871,38 @@ void Being::drawPlayer(Graphics *restrict const graphics,
         }
         else
         {
-            ActorSprite::draw1(graphics, px, py);
+            drawBeingCursor(graphics, px, py);
             drawSpriteAt(graphics, px, py);
         }
 #else
-        ActorSprite::draw1(graphics, px, py);
+        drawBeingCursor(graphics, px, py);
         drawSpriteAt(graphics, px, py);
 #endif
     }
 }
 
+void Being::drawBeingCursor(Graphics *const graphics,
+                            const int offsetX,
+                            const int offsetY) const
+{
+    if (mUsedTargetCursor)
+    {
+        mUsedTargetCursor->update(tick_time * MILLISECONDS_IN_A_TICK);
+        if (!mInfo)
+        {
+            mUsedTargetCursor->draw(graphics,
+                offsetX - mCursorPaddingX,
+                offsetY - mCursorPaddingY);
+        }
+        else
+        {
+            mUsedTargetCursor->draw(graphics,
+                offsetX + mInfo->getTargetOffsetX() - mCursorPaddingX,
+                offsetY + mInfo->getTargetOffsetY() - mCursorPaddingY);
+        }
+    }
+}
+
 void Being::drawOther(Graphics *restrict const graphics,
                       const int offsetX,
                       const int offsetY) const restrict2
@@ -2889,7 +2911,7 @@ void Being::drawOther(Graphics *restrict const graphics,
     const int px = mPixelX - mapTileSize / 2 + offsetX;
     // getActorY() + offsetY;
     const int py = mPixelY - mapTileSize + offsetY;
-    ActorSprite::draw1(graphics, px, py);
+    drawBeingCursor(graphics, px, py);
     drawSpriteAt(graphics, px, py);
 }
 
-- 
cgit v1.2.3-70-g09d2