summaryrefslogtreecommitdiff
path: root/src/particleemitter.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-14 01:46:13 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-14 01:52:42 +0300
commitc0a5fffb45f849e224750f27fa8c3be5ac447ad6 (patch)
tree1fcac5e9836e119970acae9c5702ac83f40a935f /src/particleemitter.cpp
parent1c62988a9e7ed1038250a2d044889eda046500c5 (diff)
downloadmv-c0a5fffb45f849e224750f27fa8c3be5ac447ad6.tar.gz
mv-c0a5fffb45f849e224750f27fa8c3be5ac447ad6.tar.bz2
mv-c0a5fffb45f849e224750f27fa8c3be5ac447ad6.tar.xz
mv-c0a5fffb45f849e224750f27fa8c3be5ac447ad6.zip
Add more checks.
Fix error in event.cpp from last commits. Improve party members sorting.
Diffstat (limited to 'src/particleemitter.cpp')
-rw-r--r--src/particleemitter.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 9cad0864f..1add452a0 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -225,11 +225,6 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target,
int offsetX = XML::getProperty(frameNode, "offsetX", 0);
int offsetY = XML::getProperty(frameNode, "offsetY", 0);
int rand = XML::getProperty(frameNode, "rand", 100);
- if (!imageset)
- {
- logger->log1("Error: no valid imageset");
- continue;
- }
offsetY -= imageset->getHeight() - 32;
offsetX -= imageset->getWidth() / 2 - 16;
@@ -532,12 +527,12 @@ std::list<Particle *> ParticleEmitter::createParticles(int tick)
newParticle = new ImageParticle(mMap, mParticleImage);
}
- else if (mParticleRotation.getLength() > 0)
+ else if (!mParticleRotation.empty())
{
Animation *newAnimation = new Animation(mParticleRotation);
newParticle = new RotationalParticle(mMap, newAnimation);
}
- else if (mParticleAnimation.getLength() > 0)
+ else if (!mParticleAnimation.empty())
{
Animation *newAnimation = new Animation(mParticleAnimation);
newParticle = new AnimationParticle(mMap, newAnimation);