diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-06-22 18:58:47 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-06-22 18:58:47 +0200 |
| commit | 852ff45c35c422b5264487669934b392a8657465 (patch) | |
| tree | 380751fae34a7dcd7b31bd84e303b9086eb17485 /src/particleemitter.cpp | |
| parent | 2a11c6c5d874d661dcb7f016183c3c3e64e65f3c (diff) | |
| parent | ec3c689c64922baf4a9f99bc6e9345e0a80403e8 (diff) | |
| download | mana-852ff45c35c422b5264487669934b392a8657465.tar.gz mana-852ff45c35c422b5264487669934b392a8657465.tar.bz2 mana-852ff45c35c422b5264487669934b392a8657465.tar.xz mana-852ff45c35c422b5264487669934b392a8657465.zip | |
Merge branch 'master' of gitorious.org:~bertram/mana/mana-any-square-tile-size
Diffstat (limited to 'src/particleemitter.cpp')
| -rw-r--r-- | src/particleemitter.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index b9855c10..32b63c9e 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -29,6 +29,7 @@ #include "resources/image.h" #include "resources/imageset.h" #include "resources/resourcemanager.h" +#include "map.h" #include <cmath> @@ -199,8 +200,12 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map * int delay = XML::getProperty(frameNode, "delay", 0); int offsetX = XML::getProperty(frameNode, "offsetX", 0); int offsetY = XML::getProperty(frameNode, "offsetY", 0); - offsetY -= imageset->getHeight() - 32; - offsetX -= imageset->getWidth() / 2 - 16; + if (mMap) + { + offsetX -= imageset->getWidth() / 2 + - mMap->getTileWidth() / 2; + offsetY -= imageset->getHeight() - mMap->getTileHeight(); + } if (xmlStrEqual(frameNode->name, BAD_CAST "frame")) { |