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

10 files changed, 26 insertions, 32 deletions

diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index bab5471b..8d3ed21b 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -27,7 +27,6 @@
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
-#include "npc.h"
 #include "particle.h"
 
 #include "gui/okdialog.h"
@@ -121,7 +120,7 @@ Vector BeingHandler::giveSpeedInPixelsPerTicks(float speedInTilesPerSeconds)
     return speedInTicks;
 }
 
-static void handleLooks(Player *being, Net::MessageIn &msg)
+static void handleLooks(Being *being, Net::MessageIn &msg)
 {
     // Order of sent slots. Has to be in sync with the server code.
     static int const nb_slots = 4;
@@ -170,15 +169,14 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg)
             }
             else
             {
-                being = beingManager->createBeing(id, Being::PLAYER, 0);
+                being = beingManager->createBeing(id, ActorSprite::PLAYER, 0);
                 being->setName(name);
             }
-            Player *p = static_cast< Player * >(being);
             int hs = msg.readInt8(), hc = msg.readInt8();
-            p->setSprite(SPRITE_HAIR, hs * -1, ColorDB::get(hc));
-            p->setGender(msg.readInt8() == GENDER_MALE ?
-                    GENDER_MALE : GENDER_FEMALE);
-            handleLooks(p, msg);
+            being->setSprite(SPRITE_HAIR, hs * -1, ColorDB::get(hc));
+            being->setGender(msg.readInt8() == GENDER_MALE ?
+                             GENDER_MALE : GENDER_FEMALE);
+            handleLooks(being, msg);
         } break;
 
         case OBJECT_MONSTER:
@@ -186,7 +184,7 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg)
         {
             int subtype = msg.readInt16();
             being = beingManager->createBeing(id, type == OBJECT_MONSTER ?
-                                    Being::MONSTER : Being::NPC, subtype);
+                            ActorSprite::MONSTER : ActorSprite::NPC, subtype);
             std::string name = msg.readString();
             if (name.length() > 0) being->setName(name);
         } break;
@@ -330,15 +328,14 @@ void BeingHandler::handleBeingActionChangeMessage(Net::MessageIn &msg)
 void BeingHandler::handleBeingLooksChangeMessage(Net::MessageIn &msg)
 {
     Being *being = beingManager->findBeing(msg.readInt16());
-    if (!being || being->getType() != Being::PLAYER)
+    if (!being || being->getType() != ActorSprite::PLAYER)
         return;
-    Player *player = static_cast<Player *>(being);
-    handleLooks(player, msg);
+    handleLooks(being, msg);
     if (msg.getUnreadLength())
     {
         int style = msg.readInt16();
         int color = msg.readInt16();
-        player->setSprite(SPRITE_HAIR, style * -1, ColorDB::get(color));
+        being->setSprite(SPRITE_HAIR, style * -1, ColorDB::get(color));
     }
 }
 
diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp
index a4ce6aa0..0a578a56 100644
--- a/src/net/manaserv/buysellhandler.cpp
+++ b/src/net/manaserv/buysellhandler.cpp
@@ -24,7 +24,6 @@
 #include "beingmanager.h"
 #include "item.h"
 #include "localplayer.h"
-#include "npc.h"
 
 #include "gui/buy.h"
 #include "gui/chat.h"
@@ -50,7 +49,7 @@ BuySellHandler::BuySellHandler()
 void BuySellHandler::handleMessage(Net::MessageIn &msg)
 {
     Being *being = beingManager->findBeing(msg.readInt16());
-    if (!being || being->getType() != Being::NPC)
+    if (!being || being->getType() != ActorSprite::NPC)
     {
         return;
     }
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index c070ab23..f8a1ac89 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -328,17 +328,17 @@ void CharHandler::switchCharacter()
     gameHandler->quit(true);
 }
 
-int CharHandler::baseSprite() const
+unsigned int CharHandler::baseSprite() const
 {
     return SPRITE_BASE;
 }
 
-int CharHandler::hairSprite() const
+unsigned int CharHandler::hairSprite() const
 {
     return SPRITE_HAIR;
 }
 
-int CharHandler::maxSprite() const
+unsigned int CharHandler::maxSprite() const
 {
     return SPRITE_VECTOREND;
 }
diff --git a/src/net/manaserv/charhandler.h b/src/net/manaserv/charhandler.h
index 26a7bf4e..dac4a29e 100644
--- a/src/net/manaserv/charhandler.h
+++ b/src/net/manaserv/charhandler.h
@@ -65,11 +65,11 @@ class CharHandler : public MessageHandler, public Net::CharHandler
 
         void switchCharacter();
 
-        int baseSprite() const;
+        unsigned int baseSprite() const;
 
-        int hairSprite() const;
+        unsigned int hairSprite() const;
 
-        int maxSprite() const;
+        unsigned int maxSprite() const;
 
         void clear();
 
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index 253efb01..1fbfdf21 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -275,9 +275,9 @@ void GuildHandler::invite(int guildId, const std::string &name)
     chatServerConnection->send(msg);
 }
 
-void GuildHandler::invite(int guildId, Player *player)
+void GuildHandler::invite(int guildId, Being *being)
 {
-    invite(guildId, player->getName());
+    invite(guildId, being->getName());
 }
 
 void GuildHandler::inviteResponse(int guildId, bool response)
diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h
index 9929d135..bde677fb 100644
--- a/src/net/manaserv/guildhandler.h
+++ b/src/net/manaserv/guildhandler.h
@@ -41,7 +41,7 @@ public:
 
     void invite(int guildId, const std::string &name);
 
-    void invite(int guidId, Player *player);
+    void invite(int guidId, Being *being);
 
     void inviteResponse(int guidId, bool response);
 
diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index 258c72c0..cb8aef4c 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -22,7 +22,6 @@
 #include "net/manaserv/npchandler.h"
 
 #include "beingmanager.h"
-#include "npc.h"
 
 #include "gui/npcdialog.h"
 #include "gui/npcpostdialog.h"
@@ -57,7 +56,7 @@ NpcHandler::NpcHandler()
 void NpcHandler::handleMessage(Net::MessageIn &msg)
 {
     Being *being = beingManager->findBeing(msg.readInt16());
-    if (!being || being->getType() != Being::NPC)
+    if (!being || being->getType() != ActorSprite::NPC)
     {
         return;
     }
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index ec153fa8..2fd48f57 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -136,9 +136,9 @@ void PartyHandler::join(int partyId)
     // TODO
 }
 
-void PartyHandler::invite(Player *player)
+void PartyHandler::invite(Being *being)
 {
-    invite(player->getName());
+    invite(being->getName());
 }
 
 void PartyHandler::invite(const std::string &name)
@@ -167,7 +167,7 @@ void PartyHandler::leave()
     chatServerConnection->send(msg);
 }
 
-void PartyHandler::kick(Player *player)
+void PartyHandler::kick(Being *being)
 {
     // TODO
 }
diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h
index 0777b49e..29dc280d 100644
--- a/src/net/manaserv/partyhandler.h
+++ b/src/net/manaserv/partyhandler.h
@@ -43,7 +43,7 @@ public:
 
     void join(int partyId);
 
-    void invite(Player *player);
+    void invite(Being *being);
 
     void invite(const std::string &name);
 
@@ -51,7 +51,7 @@ public:
 
     void leave();
 
-    void kick(Player *player);
+    void kick(Being *being);
 
     void kick(const std::string &name);
 
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 3a5d68a2..4514366a 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -28,7 +28,6 @@
 #include "localplayer.h"
 #include "log.h"
 #include "particle.h"
-#include "npc.h"
 
 #include "gui/chat.h"
 #include "gui/gui.h"