diff options
| author | Rogier Polak <rogier.l.a.polak@gmail.com> | 2007-03-14 17:47:44 +0000 |
|---|---|---|
| committer | Rogier Polak <rogier.l.a.polak@gmail.com> | 2007-03-14 17:47:44 +0000 |
| commit | 7ee29dd31113ea6419801e42de0e4b4a122b7aca (patch) | |
| tree | d72ab243f5f378d7254d4765b3df0b46b63f5aa3 /src/game-server/object.hpp | |
| parent | d69f5bc43d0d08f9b47465598d6b53552a252dfc (diff) | |
| download | manaserv-7ee29dd31113ea6419801e42de0e4b4a122b7aca.tar.gz manaserv-7ee29dd31113ea6419801e42de0e4b4a122b7aca.tar.bz2 manaserv-7ee29dd31113ea6419801e42de0e4b4a122b7aca.tar.xz manaserv-7ee29dd31113ea6419801e42de0e4b4a122b7aca.zip | |
Modified the game-server to use AbstractCharacterData, some renaming
Diffstat (limited to 'src/game-server/object.hpp')
| -rw-r--r-- | src/game-server/object.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/object.hpp b/src/game-server/object.hpp index b067b34b..3071f710 100644 --- a/src/game-server/object.hpp +++ b/src/game-server/object.hpp @@ -36,7 +36,7 @@ enum OBJECT_ACTOR, // An item that toggle map/quest actions (doors, switchs, ...) and can speak (map panels). OBJECT_NPC, // Non-Playable-Character is an actor capable of movement and maybe actions OBJECT_MONSTER, // A monster (moving actor with AI. Should be able to toggle map/quest actions, too) - OBJECT_PLAYER, // A normal being + OBJECT_CHARACTER,// A normal being OBJECT_OTHER // Server-only object }; @@ -87,14 +87,14 @@ class Thing * Returns whether this thing can move on the map or not. (MovingObject) */ bool canMove() const - { return mType == OBJECT_PLAYER || mType == OBJECT_MONSTER || + { return mType == OBJECT_CHARACTER || mType == OBJECT_MONSTER || mType == OBJECT_NPC; } /** * Returns whether this thing can fight or not. (Being) */ bool canFight() const - { return mType == OBJECT_PLAYER || mType == OBJECT_MONSTER; } + { return mType == OBJECT_CHARACTER || mType == OBJECT_MONSTER; } /** * Updates the internal status. |