summaryrefslogtreecommitdiff
path: root/src/particleemitter.h
diff options
context:
space:
mode:
authorMaarten Vanraes <maarten.vanraes@gmail.com>2011-05-26 22:22:10 +0200
committerMaarten Vanraes <maarten.vanraes@gmail.com>2011-05-26 22:22:10 +0200
commit98b4c6c5b5eb7c60919108c130d534938aed853e (patch)
treee79828f1c10311314402544414a81d55f6177b9c /src/particleemitter.h
parent2115769d94e29479e404fdf08c553e755250dce1 (diff)
parentaeef06d5d58dcc6f9339bf6ef5a87e06a4827b17 (diff)
downloadmanaplus-98b4c6c5b5eb7c60919108c130d534938aed853e.tar.gz
manaplus-98b4c6c5b5eb7c60919108c130d534938aed853e.tar.bz2
manaplus-98b4c6c5b5eb7c60919108c130d534938aed853e.tar.xz
manaplus-98b4c6c5b5eb7c60919108c130d534938aed853e.zip
Merge branch 'master' of git://gitorious.org/manaplus/manaplus
Diffstat (limited to 'src/particleemitter.h')
-rw-r--r--src/particleemitter.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/particleemitter.h b/src/particleemitter.h
index ed6518f0e..5a68584c6 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -32,6 +32,7 @@
#include <list>
class Image;
+class ImageSet;
class Map;
class Particle;
@@ -150,5 +151,7 @@ class ParticleEmitter
/** List of emitters the spawned particles are equipped with */
std::list<ParticleEmitter> mParticleChildEmitters;
+
+ std::list<ImageSet*> mTempSets;
};
#endif