Remove some extra declarations of "channels"

[lugaru.git] / Source / Animation.h

diff --git a/Source/Animation.h b/Source/Animation.h
index 1e5ad1019ffcbf95e5088e04b78cb8d2eab79961..668cac3456e5d482c255f4ffbbb17320ae6da7fc 100644 (file)
--- a/Source/Animation.h
+++ b/Source/Animation.h
@@ -22,11 +22,42 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef ANIMATION_H
 #define        ANIMATION_H
 
+enum anim_attack_type {
+  neutral, normalattack, reversed, reversal
+};
+
+enum anim_height_type {
+  lowheight, middleheight, highheight
+};
+
+
 enum animation_types {
-#define DECLARE_ANIM(id) id,
+#define DECLARE_ANIM(id, ...) id,
 #include "Animation.def"
 #undef DECLARE_ANIM
 animation_count
 };
 
+enum animation_bit_offsets {
+#define DECLARE_ANIM_BIT(bit) o_##bit,
+#include "Animation.def"
+#undef DECLARE_ANIM_BIT
+animation_bit_count
+};
+
+enum animation_bits_def {
+#define DECLARE_ANIM_BIT(bit) bit = 1 << o_##bit,
+#include "Animation.def"
+#undef DECLARE_ANIM_BIT
+};
+
+static const int animation_bits[animation_count] = {
+#define DECLARE_ANIM(id, name, height, type, bits) bits,
+#include "Animation.def"
+#undef DECLARE_ANIM
+};
+
+extern Animation animation[animation_count];
+
+extern void loadAllAnimations();
 #endif