1 files changed, 23 insertions, 32 deletions

diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 88f6fb2b..02574147 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -1,35 +1,34 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MONSTERINFO_H_
-#define _TMW_MONSTERINFO_H_
+#ifndef MONSTERINFO_H
+#define MONSTERINFO_H
 
+#include <list>
 #include <map>
 #include <string>
 #include <vector>
-#include <list>
 
 #include "../being.h"
 
-
 enum MonsterSoundEvent
 {
     MONSTER_EVENT_HIT,
@@ -63,47 +62,39 @@ class MonsterInfo
          */
         ~MonsterInfo();
 
-        void
-        setName(const std::string &name) { mName = name; }
+        void setName(const std::string &name) { mName = name; }
 
-        void
-        addSprite(const std::string &filename)
+        void addSprite(const std::string &filename)
         { mSprites.push_back(filename); }
 
-        void
-        setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
+        void setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
         { mTargetCursorSize = targetCursorSize; }
 
-        void
-        addSound(MonsterSoundEvent event, const std::string &filename);
+        void addSound(MonsterSoundEvent event, const std::string &filename);
 
-        void
-        addParticleEffect(const std::string &filename);
+        void addParticleEffect(const std::string &filename);
 
-        const std::string&
-        getName() const { return mName; }
+        const std::string& getName() const
+        { return mName; }
 
-        const std::list<std::string>&
-        getSprites() const { return mSprites; }
+        const std::list<std::string>& getSprites() const
+        { return mSprites; }
 
-        Being::TargetCursorSize
-        getTargetCursorSize() const { return mTargetCursorSize; }
+        Being::TargetCursorSize getTargetCursorSize() const
+        { return mTargetCursorSize; }
 
-        const std::string&
-        getSound(MonsterSoundEvent event) const;
+        const std::string &getSound(MonsterSoundEvent event) const;
 
         void addMonsterAttack(int id,
                               const std::string &particleEffect,
                               SpriteAction action);
 
-        const std::string&
-        getAttackParticleEffect(int attackType) const;
+        const std::string &getAttackParticleEffect(int attackType) const;
 
-        SpriteAction
-        getAttackAction(int attackType) const;
+        SpriteAction getAttackAction(int attackType) const;
 
-        const std::list<std::string>&
-        getParticleEffects() const { return mParticleEffects; }
+        const std::list<std::string>& getParticleEffects() const
+        { return mParticleEffects; }
 
     private:
         std::string mName;