summaryrefslogtreecommitdiff
path: root/src/being/actorsprite.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-11-27 22:08:14 +0300
committerAndrei Karas <akaras@inbox.ru>2013-11-28 18:30:52 +0300
commit4c35aa61a7cdb9897bd0ef5e2f7624a5eccaa687 (patch)
tree5f22bc4e9829f72f3439655f4ffa54770689de82 /src/being/actorsprite.cpp
parent192af63cd2d63e06172c1d42ed096af33188fd61 (diff)
downloadManaVerse-4c35aa61a7cdb9897bd0ef5e2f7624a5eccaa687.tar.gz
ManaVerse-4c35aa61a7cdb9897bd0ef5e2f7624a5eccaa687.tar.bz2
ManaVerse-4c35aa61a7cdb9897bd0ef5e2f7624a5eccaa687.tar.xz
ManaVerse-4c35aa61a7cdb9897bd0ef5e2f7624a5eccaa687.zip
Remove some virtual methods in actorsprite and being.
Diffstat (limited to 'src/being/actorsprite.cpp')
-rw-r--r--src/being/actorsprite.cpp25
1 files changed, 4 insertions, 21 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 327996e2d..133e3594f 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -75,34 +75,17 @@ ActorSprite::~ActorSprite()
}
}
-bool ActorSprite::draw(Graphics *const graphics,
+void ActorSprite::draw1(Graphics *const graphics,
const int offsetX, const int offsetY) const
{
- FUNC_BLOCK("ActorSprite::draw", 1)
- const int px = getPixelX() + offsetX - mapTileSize / 2;
- // Temporary fix to the Y offset.
-#ifdef MANASERV_SUPPORT
- const int py = getPixelY() + offsetY -
- ((Net::getNetworkType() == ServerInfo::MANASERV) ? 15 : mapTileSize);
-#else
- const int py = getPixelY() + offsetY - mapTileSize;
-#endif
-
+ FUNC_BLOCK("ActorSprite::draw1", 1)
if (mUsedTargetCursor)
{
mUsedTargetCursor->update(tick_time * MILLISECONDS_IN_A_TICK);
mUsedTargetCursor->draw(graphics,
- px + getTargetOffsetX() - mCursorPaddingX,
- py + getTargetOffsetY() - mCursorPaddingY);
+ offsetX + getTargetOffsetX() - mCursorPaddingX,
+ offsetY + getTargetOffsetY() - mCursorPaddingY);
}
-
- return drawSpriteAt(graphics, px, py);
-}
-
-bool ActorSprite::drawSpriteAt(Graphics *const graphics,
- const int x, const int y) const
-{
- return CompoundSprite::draw(graphics, x, y);
}
void ActorSprite::logic()