summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_fr>2010-05-07 00:26:28 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_fr>2010-05-21 20:09:45 +0200
commitd34dda737ed8af5135c49e269f5ad608cea8d511 (patch)
treeb907049fcf94a432a911d73040b404abcda0d6cb
parentda50354af7fffe79ee7137a3f3dd9d8b9f34afda (diff)
downloadmana-client-d34dda737ed8af5135c49e269f5ad608cea8d511.tar.gz
mana-client-d34dda737ed8af5135c49e269f5ad608cea8d511.tar.bz2
mana-client-d34dda737ed8af5135c49e269f5ad608cea8d511.tar.xz
mana-client-d34dda737ed8af5135c49e269f5ad608cea8d511.zip
Merge protocol from manaserv about thing types.
Reviewed-by: Jaxad0127 (A few days ago...)
-rw-r--r--src/net/manaserv/beinghandler.cpp2
-rw-r--r--src/net/manaserv/protocol.h21
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