summaryrefslogtreecommitdiff
path: root/src/game-server/being.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game-server/being.hpp')
-rw-r--r--src/game-server/being.hpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/game-server/being.hpp b/src/game-server/being.hpp
index e0d064bd..3872e661 100644
--- a/src/game-server/being.hpp
+++ b/src/game-server/being.hpp
@@ -60,7 +60,7 @@ enum Element
/**
* Beings and actors directions
*/
-enum
+enum Direction
{
DIRECTION_DOWN = 1,
DIRECTION_UP,
@@ -154,7 +154,7 @@ class Being : public MovingObject
* stats, deducts the result from the hitpoints and adds the result to
* the HitsTaken list.
*/
- void damage(Damage);
+ virtual int damage(Damage damage);
/**
* Kills the being
@@ -239,15 +239,13 @@ class Being : public MovingObject
int mHitpoints; /**< Hitpoints of the being */
Action mAction;
-
std::vector<unsigned short> mAttributes;
+ std::list<DeathListener*> mDeathListeners;
private:
Being(Being const &rhs);
Being &operator=(Being const &rhs);
- std::list<DeathListener*> mDeathListeners;
-
Hits mHitsTaken; /**< List of punches taken since last update */
};