summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Sehmisch <mana@crushnet.org>2010-03-04 22:09:44 +0100
committerPhilipp Sehmisch <mana@crushnet.org>2010-03-04 22:09:44 +0100
commiteefe244e276634d59d5e6b89217f5747bb2afd97 (patch)
treeae1a0776b8a76cb30b2ece410c8a40a9843a7520
parentc176df1796a7b0fd53b52b52e8bd9d4a81ff8b1a (diff)
downloadmana-eefe244e276634d59d5e6b89217f5747bb2afd97.tar.gz
mana-eefe244e276634d59d5e6b89217f5747bb2afd97.tar.bz2
mana-eefe244e276634d59d5e6b89217f5747bb2afd97.tar.xz
mana-eefe244e276634d59d5e6b89217f5747bb2afd97.zip
Fixed crash when a map-based particle effect can't be loaded
-rw-r--r--src/map.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 24b3e84b..b1bd634b 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -802,7 +802,7 @@ void Map::initializeParticleEffects(Particle *particleEngine)
)
{
p = particleEngine->addEffect(i->file, i->x, i->y);
- if (i->w > 0 && i->h > 0)
+ if (p && i->w > 0 && i->h > 0)
{
p->adjustEmitterSize(i->w, i->h);
}