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/item.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/item.hpp')
| -rw-r--r-- | src/game-server/item.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/item.hpp b/src/game-server/item.hpp index 7acb1a7c..4da82cf7 100644 --- a/src/game-server/item.hpp +++ b/src/game-server/item.hpp @@ -24,7 +24,7 @@ #include <vector> -#include "game-server/object.hpp" +#include "game-server/actor.hpp" class AttackZone; class Being; @@ -292,11 +292,11 @@ class ItemClass AttackZone *mAttackZone; /**< Attack zone when used as a weapon */ }; -class Item : public Object +class Item : public Actor { public: Item(ItemClass *type, int amount) - : Object(OBJECT_ITEM), mType(type), mAmount(amount) + : Actor(OBJECT_ITEM), mType(type), mAmount(amount) {} ItemClass *getItemClass() const |