diff options
author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-03-05 22:33:09 +0000 |
---|---|---|
committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-03-05 22:33:09 +0000 |
commit | 5f9bbd205fec7d66643861a5204c6cc7dec639ba (patch) | |
tree | ad21b3432c3cafb10a9e4a7d32b600cebe74d92c /src/being.h | |
parent | a74208583e806fcfdc485428fb4f9e694e962455 (diff) | |
download | mana-5f9bbd205fec7d66643861a5204c6cc7dec639ba.tar.gz mana-5f9bbd205fec7d66643861a5204c6cc7dec639ba.tar.bz2 mana-5f9bbd205fec7d66643861a5204c6cc7dec639ba.tar.xz mana-5f9bbd205fec7d66643861a5204c6cc7dec639ba.zip |
Merged new_playerset branch into trunk.
Diffstat (limited to 'src/being.h')
-rw-r--r-- | src/being.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/being.h b/src/being.h index 6f8e578c..a3884056 100644 --- a/src/being.h +++ b/src/being.h @@ -31,7 +31,7 @@ #include "sprite.h" #include "map.h" -#define NR_HAIR_STYLES 5 +#define NR_HAIR_STYLES 6 #define NR_HAIR_COLORS 10 class Map; @@ -63,14 +63,14 @@ class Being : public Sprite }; enum Action { - STAND = 0, - WALK = 1, - ATTACK = 5, - BOW_ATTACK = 9, - MONSTER_DEAD = 9, - SIT = 13, - HIT = 14, - DEAD = 15 + STAND = 0, + WALK = 1, + MONSTER_ATTACK = 5, + SIT = 7, + DEAD = 8, + ATTACK = 9, + MONSTER_DEAD = 9, + HIT = 17 }; /** |