summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-07-30 14:30:28 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-07-30 14:30:28 +0200
commit1937ef53c8dd42d986c0a6b061a482a6d8e3c0f7 (patch)
tree3da60994f077b7f6751c7ee29018ea3aefeb22a2 /src
parent4cbbfeca46c60fc0efdfe901e69324cd8358308e (diff)
downloadmana-1937ef53c8dd42d986c0a6b061a482a6d8e3c0f7.tar.gz
mana-1937ef53c8dd42d986c0a6b061a482a6d8e3c0f7.tar.bz2
mana-1937ef53c8dd42d986c0a6b061a482a6d8e3c0f7.tar.xz
mana-1937ef53c8dd42d986c0a6b061a482a6d8e3c0f7.zip
I forgot to tidy src/resources/spritedef.h
(Trivial)
Diffstat (limited to 'src')
-rw-r--r--src/resources/spritedef.h35
1 files changed, 2 insertions, 33 deletions
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<SpriteReference*>::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,