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, 6 insertions, 6 deletions

diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index a953f474..468c77f5 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -22,9 +22,9 @@
 #include "gui/widgets/playerbox.h"
 
 #include "animatedsprite.h"
+#include "being.h"
 #include "configuration.h"
 #include "graphics.h"
-#include "player.h"
 
 #include "gui/theme.h"
 
@@ -36,8 +36,8 @@ int PlayerBox::instances = 0;
 float PlayerBox::mAlpha = 1.0;
 ImageRect PlayerBox::background;
 
-PlayerBox::PlayerBox(const Player *player):
-    mPlayer(player)
+PlayerBox::PlayerBox(const Being *being):
+    mBeing(being)
 {
     setFrameSize(2);
 
@@ -72,7 +72,7 @@ PlayerBox::~PlayerBox()
 {
     instances--;
 
-    mPlayer = 0;
+    mBeing = 0;
 
     if (instances == 0)
     {
@@ -82,13 +82,13 @@ PlayerBox::~PlayerBox()
 
 void PlayerBox::draw(gcn::Graphics *graphics)
 {
-    if (mPlayer)
+    if (mBeing)
     {
         // Draw character
         const int bs = getFrameSize();
         const int x = getWidth() / 2 + bs - 16;
         const int y = getHeight() - bs - 32;
-        mPlayer->drawSpriteAt(static_cast<Graphics*>(graphics), x, y);
+        mBeing->drawSpriteAt(static_cast<Graphics*>(graphics), x, y);
     }
 
     if (config.getValue("guialpha", 0.8) != mAlpha)