Remove some extra declarations of "channels"

[lugaru.git] / Source / Animation.h

diff --git a/Source/Animation.h b/Source/Animation.h
index b8e821b721dff7e41daff1f2996d09b5c718e799..668cac3456e5d482c255f4ffbbb17320ae6da7fc 100644 (file)
--- a/Source/Animation.h
+++ b/Source/Animation.h
@@ -32,11 +32,32 @@ enum anim_height_type {
 
 
 enum animation_types {
-#define DECLARE_ANIM(id, file, height, attack) 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