rnd-20030203-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 21906949f6bc1bfaa0dd010c9ef92a0a717c0362..3e86c7f9ab85d04b2aacca56e7f2cf91eacc7afb 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -182,6 +182,7 @@
 #define IS_ANIMATED(g)         (ANIM_FRAMES(g) > 1)
 #define IS_NEW_DELAY(f, g)     ((f) % ANIM_DELAY(g) == 0)
 #define IS_NEW_FRAME(f, g)     (IS_ANIMATED(g) && IS_NEW_DELAY(f, g))
+#define IS_NEXT_FRAME(f, g)    (IS_NEW_FRAME(f, g) && (f) > 0)
 
 #define IS_LOOP_SOUND(s)       (sound_info[s].loop)
 
@@ -746,35 +747,15 @@
 #define EL_INVISIBLE_STEELWALL_HORIZONTAL      (EL_FIRST_DUMMY + 10)
 #define EL_INVISIBLE_STEELWALL_VERTICAL                (EL_FIRST_DUMMY + 11)
 #define EL_SAND_CRUMBLED                       (EL_FIRST_DUMMY + 12)
-#define EL_BD_AMOEBA_PART1                     (EL_FIRST_DUMMY + 13)
-#define EL_BD_AMOEBA_PART2                     (EL_FIRST_DUMMY + 14)
-#define EL_BD_AMOEBA_PART3                     (EL_FIRST_DUMMY + 15)
-#define EL_BD_AMOEBA_PART4                     (EL_FIRST_DUMMY + 16)
-#define EL_AMOEBA_WET_PART1                    (EL_FIRST_DUMMY + 17)
-#define EL_AMOEBA_WET_PART2                    (EL_FIRST_DUMMY + 18)
-#define EL_AMOEBA_WET_PART3                    (EL_FIRST_DUMMY + 19)
-#define EL_AMOEBA_WET_PART4                    (EL_FIRST_DUMMY + 20)
-#define EL_AMOEBA_DRY_PART1                    (EL_FIRST_DUMMY + 21)
-#define EL_AMOEBA_DRY_PART2                    (EL_FIRST_DUMMY + 22)
-#define EL_AMOEBA_DRY_PART3                    (EL_FIRST_DUMMY + 23)
-#define EL_AMOEBA_DRY_PART4                    (EL_FIRST_DUMMY + 24)
-#define EL_AMOEBA_FULL_PART1                   (EL_FIRST_DUMMY + 25)
-#define EL_AMOEBA_FULL_PART2                   (EL_FIRST_DUMMY + 26)
-#define EL_AMOEBA_FULL_PART3                   (EL_FIRST_DUMMY + 27)
-#define EL_AMOEBA_FULL_PART4                   (EL_FIRST_DUMMY + 28)
-#define EL_AMOEBA_DEAD_PART1                   (EL_FIRST_DUMMY + 29)
-#define EL_AMOEBA_DEAD_PART2                   (EL_FIRST_DUMMY + 30)
-#define EL_AMOEBA_DEAD_PART3                   (EL_FIRST_DUMMY + 31)
-#define EL_AMOEBA_DEAD_PART4                   (EL_FIRST_DUMMY + 32)
-#define EL_DYNABOMB_ACTIVE                     (EL_FIRST_DUMMY + 33)
-#define EL_SHIELD_NORMAL_ACTIVE                        (EL_FIRST_DUMMY + 34)
-#define EL_SHIELD_DEADLY_ACTIVE                        (EL_FIRST_DUMMY + 35)
-#define EL_ARROW_RED_LEFT                      (EL_FIRST_DUMMY + 36)
-#define EL_ARROW_RED_RIGHT                     (EL_FIRST_DUMMY + 37)
-#define EL_ARROW_RED_UP                                (EL_FIRST_DUMMY + 38)
-#define EL_ARROW_RED_DOWN                      (EL_FIRST_DUMMY + 39)
-
-#define MAX_NUM_ELEMENTS                       (EL_FIRST_DUMMY + 40)
+#define EL_DYNABOMB_ACTIVE                     (EL_FIRST_DUMMY + 13)
+#define EL_SHIELD_NORMAL_ACTIVE                        (EL_FIRST_DUMMY + 14)
+#define EL_SHIELD_DEADLY_ACTIVE                        (EL_FIRST_DUMMY + 15)
+#define EL_ARROW_RED_LEFT                      (EL_FIRST_DUMMY + 16)
+#define EL_ARROW_RED_RIGHT                     (EL_FIRST_DUMMY + 17)
+#define EL_ARROW_RED_UP                                (EL_FIRST_DUMMY + 18)
+#define EL_ARROW_RED_DOWN                      (EL_FIRST_DUMMY + 19)
+
+#define MAX_NUM_ELEMENTS                       (EL_FIRST_DUMMY + 20)
 
 
 /* values for graphics/sounds action types */