Remove Monster, Player, and NPC classes

Instead of having these three subclasses with minor differences, this
commit merges them back into Being. In the future, we can make Beings
that are talkable to some, attackable by others, etc. This also puts
back support for monster equipment.

Also changes remaining references to Being::Type and the constants to
refer to ActorSprite::Type.

Reviewed-by: Freeyorp

1 files changed, 3 insertions, 11 deletions

diff --git a/src/localplayer.h b/src/localplayer.h
index 38212a60..a7ed33f8 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -22,7 +22,7 @@
 #ifndef LOCALPLAYER_H
 #define LOCALPLAYER_H
 
-#include "player.h"
+#include "being.h"
 
 #include "gui/userpalette.h"
 
@@ -109,7 +109,7 @@ enum
 /**
  * The local player character.
  */
-class LocalPlayer : public Player
+class LocalPlayer : public Being
 {
     public:
         /**
@@ -194,11 +194,6 @@ class LocalPlayer : public Player
 
         void attack(Being *target = NULL, bool keep = false);
 
-        /**
-         * Triggers whether or not to show the name as a GM name.
-         */
-        virtual void setGM(bool gm);
-
         void setGMLevel(int level);
 
         void stopAttack();
@@ -403,7 +398,7 @@ class LocalPlayer : public Player
         std::string getFollow() const { return mPlayerFollowed; }
 
         /**
-         * Tells the engine wether to check
+         * Tells the engine whether to check
          * if the Player Name is to be displayed.
          */
         void setCheckNameSetting(bool checked) { mUpdateName = checked; }
@@ -424,9 +419,6 @@ class LocalPlayer : public Player
 
         virtual void handleStatusEffect(StatusEffect *effect, int effectId);
 
-        // Colors don't change for local player
-        virtual void updateColors() {}
-
         void startWalking(unsigned char dir);
 
         int mAttackRange;