summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-03-17 19:27:39 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-03-17 19:27:39 +0100
commit2a2316f720ed7f821809cff840487e992f4918d3 (patch)
treeb1a2198013c984ed21cdeebe708104b697ba933d /src
parent45c3f943b42423dbe162bfac4a57cad013ba0630 (diff)
downloadmana-2a2316f720ed7f821809cff840487e992f4918d3.tar.gz
mana-2a2316f720ed7f821809cff840487e992f4918d3.tar.bz2
mana-2a2316f720ed7f821809cff840487e992f4918d3.tar.xz
mana-2a2316f720ed7f821809cff840487e992f4918d3.zip
Fix actor and floor items offsets on tA.
The code was simplified a bit, too.
Diffstat (limited to 'src')
-rw-r--r--src/actorsprite.cpp3
-rw-r--r--src/flooritem.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index e43d94e1..0b1dfd39 100644
--- a/src/actorsprite.cpp
+++ b/src/actorsprite.cpp
@@ -72,8 +72,7 @@ bool ActorSprite::draw(Graphics *graphics, int offsetX, int offsetY) const
// best where their base point should be.
const int px = getPixelX() + offsetX - 16;
// Temporary fix to the Y offset.
- const int py = getPixelY() + offsetY -
- ((Net::getNetworkType() == ServerInfo::MANASERV) ? 15 : 32);
+ const int py = getPixelY() + offsetY - 16;
if (mUsedTargetCursor)
{
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index db62ce9a..c5a031fe 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -42,8 +42,7 @@ FloorItem::FloorItem(int id,
// these translations aren't necessary anymore. The sprites know
// best where their base point should be.
mPos.x = x * map->getTileWidth() + 16;
- mPos.y = y * map->getTileHeight() +
- ((Net::getNetworkType() == ServerInfo::MANASERV) ? 15 : 32);
+ mPos.y = y * map->getTileHeight() + 16;
setupSpriteDisplay(itemDb->get(itemId).getDisplay());
}