Merged revisions 3823,3825-3826,3829,3831-3839,3841-3842 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r3823 | crush_tmw | 2007-12-28 19:36:58 +0100 (Fri, 28 Dec 2007) | 1 line
  
  Added the possibility to assign particle effects to monsters in the monster database. Added flame particle effect to fire goblin as a proof of concept.
........
  r3826 | crush_tmw | 2007-12-30 01:02:14 +0100 (Sun, 30 Dec 2007) | 1 line
  
  Added a key for targeting the nearest player character based on patches by Trinexx. Some mapping fixes at snake dungeon map.
........
  r3839 | the_enemy | 2008-01-13 17:28:50 +0100 (Sun, 13 Jan 2008) | 1 line
  
  Fixed non-default location music loading
........
  r3842 | crush_tmw | 2008-01-14 11:48:13 +0100 (Mon, 14 Jan 2008) | 1 line
  
  ixed an error in Davids last commit (couldn't compile that way).
........

1 files changed, 13 insertions, 5 deletions

diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 840f37be..f34a3ea9 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -27,6 +27,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include <list>
 
 #include "../being.h"
 
@@ -65,17 +66,20 @@ class MonsterInfo
         ~MonsterInfo();
 
         void
-        setName(std::string name) { mName = name; }
+        setName(const std::string &name) { mName = name; }
 
         void
-        setSprite(std::string filename) { mSprite = filename; }
+        setSprite(const std::string &filename) { mSprite = filename; }
 
         void
         setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
         { mTargetCursorSize = targetCursorSize; }
 
         void
-        addSound(MonsterSoundEvent event, std::string filename);
+        addSound(MonsterSoundEvent event, const std::string &filename);
+
+        void
+        addParticleEffect(const std::string &filename);
 
         const std::string&
         getName() const { return mName; }
@@ -89,7 +93,9 @@ class MonsterInfo
         const std::string&
         getSound(MonsterSoundEvent event) const;
 
-        void addMonsterAttack (int id, const std::string &particleEffect, SpriteAction action);
+        void addMonsterAttack(int id,
+                              const std::string &particleEffect,
+                              SpriteAction action);
 
         const std::string&
         getAttackParticleEffect(int attackType) const;
@@ -97,7 +103,8 @@ class MonsterInfo
         SpriteAction
         getAttackAction(int attackType) const;
 
-
+        const std::list<std::string>&
+        getParticleEffects() const { return mParticleEffects; }
 
     private:
         std::string mName;
@@ -105,6 +112,7 @@ class MonsterInfo
         Being::TargetCursorSize mTargetCursorSize;
         std::map<MonsterSoundEvent, std::vector<std::string>* > mSounds;
         std::map<int, MonsterAttack*> mMonsterAttacks;
+        std::list<std::string> mParticleEffects;
 };
 
 #endif