Merged with Aethyra master as of 2009-01-27

Conflicts:
	Almost everywhere.

1 files changed, 21 insertions, 22 deletions

diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index b37ac1a9..75464035 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -22,14 +22,13 @@
 #ifndef MONSTERINFO_H
 #define MONSTERINFO_H
 
+#include <list>
 #include <map>
 #include <string>
 #include <vector>
-#include <list>
 
 #include "../being.h"
 
-
 enum MonsterSoundEvent
 {
     MONSTER_EVENT_HIT,
@@ -57,39 +56,39 @@ class MonsterInfo
          */
         ~MonsterInfo();
 
-        void
-        setName(std::string name) { mName = name; }
+        void setName(std::string name) { mName = name; }
 
-        void
-        addSprite(std::string filename) { mSprites.push_back(filename); }
+        void addSprite(std::string filename) { mSprites.push_back(filename); }
 
-        void
-        setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
+        void setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
         { mTargetCursorSize = targetCursorSize; }
 
-        void
-        addSound(MonsterSoundEvent event, std::string filename);
+        void addSound(MonsterSoundEvent event, std::string filename);
+
+        void addParticleEffect(std::string filename);
+
+        const std::string& getName() const 
+        { return mName; }
 
-        void
-        addParticleEffect(std::string filename);
+        const std::list<std::string>& getSprites() const 
+        { return mSprites; }
 
-        const std::string&
-        getName() const { return mName; }
+        Being::TargetCursorSize getTargetCursorSize() const 
+        { return mTargetCursorSize; }
 
-        const std::list<std::string>&
-        getSprites() const { return mSprites; }
+        std::string getSound(MonsterSoundEvent event) const;
 
-        Being::TargetCursorSize
-        getTargetCursorSize() const { return mTargetCursorSize; }
+        std::string getAttackParticleEffect() const { return mAttackParticle; }
 
-        std::string
-        getSound(MonsterSoundEvent event) const;
+        void addAttackParticleEffect(const std::string &particleEffect)
+        { mAttackParticle = particleEffect; }
 
-        const std::list<std::string>&
-        getParticleEffects() const { return mParticleEffects; }
+        const std::list<std::string>& getParticleEffects() const 
+        { return mParticleEffects; }
 
     private:
         std::string mName;
+        std::string mAttackParticle;
         std::list<std::string> mSprites;
         Being::TargetCursorSize mTargetCursorSize;
         std::map<MonsterSoundEvent, std::vector<std::string>* > mSounds;