From 1937ef53c8dd42d986c0a6b061a482a6d8e3c0f7 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Fri, 30 Jul 2010 14:30:28 +0200 Subject: I forgot to tidy src/resources/spritedef.h (Trivial) --- src/resources/spritedef.h | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) (limited to 'src') diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 16b8c0c8..6c076e3a 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -54,38 +54,7 @@ struct SpriteDisplay }; typedef std::list::const_iterator SpriteRefs; -#if 0 -enum SpriteAction -{ - ACTION_DEFAULT = 0, - ACTION_STAND, - ACTION_WALK, - ACTION_RUN, - ACTION_ATTACK, - ACTION_ATTACK_SWING, - ACTION_ATTACK_STAB, - ACTION_ATTACK_BOW, - ACTION_ATTACK_THROW, - ACTION_SPECIAL_0, - ACTION_SPECIAL_1, - ACTION_SPECIAL_2, - ACTION_SPECIAL_3, - ACTION_SPECIAL_4, - ACTION_SPECIAL_5, - ACTION_SPECIAL_6, - ACTION_SPECIAL_7, - ACTION_SPECIAL_8, - ACTION_SPECIAL_9, - ACTION_CAST_MAGIC, - ACTION_USE_ITEM, - ACTION_SIT, - ACTION_SLEEP, - ACTION_HURT, - ACTION_DEAD, - ACTION_INVALID -}; -#endif -#if 1 // Aim to be reached + /* * Remember those are the main action. * Action subtypes, e.g.: "attack_bow" are to be passed by items.xml after @@ -110,7 +79,7 @@ namespace SpriteAction static const std::string USE_ITEM = "item"; static const std::string INVALID = ""; }; -#endif + enum SpriteDirection { DIRECTION_DEFAULT = 0, -- cgit v1.2.3-60-g2f50