diff options
| -rw-r--r-- | src/common/manaserv_protocol.h | 15 | ||||
| -rw-r--r-- | src/game-server/state.cpp | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/common/manaserv_protocol.h b/src/common/manaserv_protocol.h index 411b08ca..c24b1300 100644 --- a/src/common/manaserv_protocol.h +++ b/src/common/manaserv_protocol.h @@ -371,21 +371,18 @@ enum AttribmodResponseCode { enum EntityType { // A simple item. - OBJECT_ITEM = 0, - // An item that toggle map/quest actions (doors, switchs, ...) - // and can speak (map panels). - OBJECT_ACTOR, + OBJECT_ITEM = 0, // Non-Playable-Character is an actor capable of movement and maybe actions. - OBJECT_NPC, + OBJECT_NPC = 2, // A monster (moving actor with AI. Should be able to toggle map/quest // actions, too). - OBJECT_MONSTER, + OBJECT_MONSTER = 3, // A normal being. - OBJECT_CHARACTER, + OBJECT_CHARACTER = 4, // A effect to be shown. - OBJECT_EFFECT, + OBJECT_EFFECT = 5, // Server-only object. - OBJECT_OTHER + OBJECT_OTHER = 6 }; // Moving object flags diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp index 054917b3..e997ad59 100644 --- a/src/game-server/state.cpp +++ b/src/game-server/state.cpp @@ -610,7 +610,6 @@ bool GameState::insert(Entity *ptr) << monsterComponent->getSpecy()->getId()); break; } - case OBJECT_ACTOR: case OBJECT_OTHER: default: LOG_DEBUG("Entity inserted: " << obj->getType()); @@ -688,7 +687,6 @@ void GameState::remove(Entity *ptr) << monsterComponent->getSpecy()->getId()); break; } - case OBJECT_ACTOR: case OBJECT_OTHER: default: LOG_DEBUG("Entity removed: " << ptr->getType()); |