summaryrefslogtreecommitdiff
path: root/src/particle
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/particle
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/particle')
-rw-r--r--src/particle/particleemitter.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index 74aec293a..089fa31de 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -23,6 +23,7 @@
#include "particle/particleemitter.h"
#include "logger.h"
+#include "map.h"
#include "particle/animationparticle.h"
#include "particle/rotationalparticle.h"
@@ -253,9 +254,9 @@ ParticleEmitter::ParticleEmitter(const XmlNodePtr emitterNode,
const int delay = XML::getIntProperty(
frameNode, "delay", 0, 0, 100000);
const int offsetX = XML::getProperty(frameNode, "offsetX", 0)
- - imageset->getWidth() / 2 + 16;
+ - imageset->getWidth() / 2 + mapTileSize / 2;
const int offsetY = XML::getProperty(frameNode, "offsetY", 0)
- - imageset->getHeight() + 32;
+ - imageset->getHeight() + mapTileSize;
const int rand = XML::getIntProperty(
frameNode, "rand", 100, 0, 100);
@@ -327,9 +328,9 @@ ParticleEmitter::ParticleEmitter(const XmlNodePtr emitterNode,
const int delay = XML::getIntProperty(
frameNode, "delay", 0, 0, 100000);
const int offsetX = XML::getProperty(frameNode, "offsetX", 0)
- - imageset->getWidth() / 2 + 16;
+ - imageset->getWidth() / 2 + mapTileSize / 2;
const int offsetY = XML::getProperty(frameNode, "offsetY", 0)
- - imageset->getHeight() + 32;
+ - imageset->getHeight() + mapTileSize;
const int rand = XML::getIntProperty(
frameNode, "rand", 100, 0, 100);