diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-06-04 21:48:47 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-06-04 21:48:47 +0000 |
commit | a353543dd4da3c489a84f6f17125fdd0e1be2349 (patch) | |
tree | 5e447a0f9a3fd50f58a48f39bbb77d392d78af36 /src/map.h | |
parent | ab072dddb231895ba7b6762eda9fa70af961b0fb (diff) | |
download | Mana-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.gz Mana-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.bz2 Mana-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.xz Mana-a353543dd4da3c489a84f6f17125fdd0e1be2349.zip |
Merged 0.0 changes from revision 3234 to 3317 to trunk.
Diffstat (limited to 'src/map.h')
-rw-r--r-- | src/map.h | 25 |
1 files changed, 23 insertions, 2 deletions
@@ -32,8 +32,9 @@ class AmbientOverlay; class Graphics; class Image; -class Tileset; +class Particle; class Sprite; +class Tileset; struct PATH_NODE; @@ -185,6 +186,17 @@ class Map : public Properties void removeSprite(SpriteIterator iterator); + /** + * Adds a particle effect + */ + void addParticleEffect (std::string effectFile, int x, int y); + + /** + * Initializes all added particle effects + */ + void + initializeParticleEffects(Particle* particleEngine); + private: /** * Converts a global tile id to the Image* pointing to the associated @@ -220,10 +232,19 @@ class Map : public Properties // Pathfinding members int mOnClosedList, mOnOpenList; - //overlay Data + // Overlay Data std::list<AmbientOverlay*> mOverlays; float mLastScrollX; float mLastScrollY; + + // Particle effect data + struct ParticleEffectData + { + std::string file; + int x; + int y; + }; + std::list<ParticleEffectData> particleEffects; }; #endif |