diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-23 21:00:16 +0200 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-26 17:18:21 +0200 |
commit | e726c34606f85347e70a0deb6b180db03b6d0c25 (patch) | |
tree | e78e5ba07dd9484abed035cc3e63744101bbef57 /src/game-server/character.hpp | |
parent | a3f72002fa02cd4c525f101c5f240a22d4480119 (diff) | |
download | manaserv-e726c34606f85347e70a0deb6b180db03b6d0c25.tar.gz manaserv-e726c34606f85347e70a0deb6b180db03b6d0c25.tar.bz2 manaserv-e726c34606f85347e70a0deb6b180db03b6d0c25.tar.xz manaserv-e726c34606f85347e70a0deb6b180db03b6d0c25.zip |
Merged MovingObject into the Being class
Also renamed Object to Actor, to make it sound a little less generic.
Cleans up a bit the rather big hierarchy of different object types we
have.
Diffstat (limited to 'src/game-server/character.hpp')
-rw-r--r-- | src/game-server/character.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game-server/character.hpp b/src/game-server/character.hpp index 8e2cc954..33be114e 100644 --- a/src/game-server/character.hpp +++ b/src/game-server/character.hpp @@ -303,7 +303,7 @@ class Character : public Being { return mCorrectionPoints; } /** - * Gets the way the object is blocked by other things on the map + * Gets the way the actor is blocked by other things on the map */ virtual unsigned char getWalkMask() const { return 0x82; } // blocked by walls and monsters ( bin 1000 0010) @@ -379,7 +379,7 @@ class Character : public Being protected: /** - * Gets the way the object blocks pathfinding for other objects + * Gets the way the actor blocks pathfinding for other objects */ virtual Map::BlockType getBlockType() const { return Map::BLOCKTYPE_CHARACTER; } |