Merge protocol from manaserv about thing types.

Reviewed-by: Jaxad0127
(A few days ago...)

2 files changed, 15 insertions, 8 deletions

diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index bab5471b..b08af749 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -160,7 +160,7 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg)
 
     switch (type)
     {
-        case OBJECT_PLAYER:
+        case OBJECT_CHARACTER:
         {
             std::string name = msg.readString();
             if (player_node->getName() == name)
diff --git a/src/net/manaserv/protocol.h b/src/net/manaserv/protocol.h
index 2654da74..226a27a0 100644
--- a/src/net/manaserv/protocol.h
+++ b/src/net/manaserv/protocol.h
@@ -314,17 +314,24 @@ enum AttribmodResponseCode {
 };
 
 // Object type enumeration
-enum {
-    // A simple item
+enum ThingType
+{
+    // A simple item.
     OBJECT_ITEM = 0,
-    // An item that can be activated (doors, switchs, sign, ...)
+    // An item that toggle map/quest actions (doors, switchs, ...)
+    // and can speak (map panels).
     OBJECT_ACTOR,
-    // Non-Playable-Character is an actor capable of movement and maybe actions
+    // Non-Playable-Character is an actor capable of movement and maybe actions.
     OBJECT_NPC,
-    // A monster (moving actor with AI. able to toggle map/quest actions, too)
+    // A monster (moving actor with AI. Should be able to toggle map/quest
+    // actions, too).
     OBJECT_MONSTER,
-    // A player
-    OBJECT_PLAYER
+    // A normal being.
+    OBJECT_CHARACTER,
+    // A effect to be shown.
+    OBJECT_EFFECT,
+    // Server-only object.
+    OBJECT_OTHER
 };
 
 // Moving object flags