summaryrefslogtreecommitdiff
path: root/src/resources/spritedef.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-01 22:30:44 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-01 22:30:44 +0300
commitd13de51121a332cf8613a38d7ed5468f971c999f (patch)
tree253c2911e291303fd90eb5d61c23076630782a11 /src/resources/spritedef.cpp
parent6915c38ca9c35bfb9a5ea05fe957463d644a75de (diff)
downloadmv-d13de51121a332cf8613a38d7ed5468f971c999f.tar.gz
mv-d13de51121a332cf8613a38d7ed5468f971c999f.tar.bz2
mv-d13de51121a332cf8613a38d7ed5468f971c999f.tar.xz
mv-d13de51121a332cf8613a38d7ed5468f971c999f.zip
replace tile size from 32 to mapTitleSize.
Diffstat (limited to 'src/resources/spritedef.cpp')
-rw-r--r--src/resources/spritedef.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index af0ada0dc..1c593fc71 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -23,6 +23,7 @@
#include "resources/spritedef.h"
#include "logger.h"
+#include "map.h"
#include "resources/action.h"
#include "resources/animation.h"
@@ -293,10 +294,11 @@ void SpriteDef::loadAnimation(const XmlNodePtr animationNode,
{
const int delay = XML::getIntProperty(
frameNode, "delay", 0, 0, 100000);
- const int offsetX = XML::getProperty(frameNode, "offsetX", 0) +
- imageSet->getOffsetX() - imageSet->getWidth() / 2 + 16;
- const int offsetY = XML::getProperty(frameNode, "offsetY", 0) +
- imageSet->getOffsetY() - imageSet->getHeight() + 32;
+ const int offsetX = XML::getProperty(frameNode, "offsetX", 0)
+ + imageSet->getOffsetX() - imageSet->getWidth() / 2
+ + mapTileSize / 2;
+ const int offsetY = XML::getProperty(frameNode, "offsetY", 0)
+ + imageSet->getOffsetY() - imageSet->getHeight() + mapTileSize;
const int rand = XML::getIntProperty(frameNode, "rand", 100, 0, 100);
if (xmlNameEqual(frameNode, "frame"))