removed global animation configuration option '.step_frames' again

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 0d7218ad47981fdae3e279be06391515baade289..1e97b9c902fe938d221b83177fb2b1ce14072b0f 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1868,36 +1868,38 @@
 #define GFX_ARG_STEP_OFFSET            25
 #define GFX_ARG_STEP_XOFFSET           26
 #define GFX_ARG_STEP_YOFFSET           27
-#define GFX_ARG_STEP_FRAMES            28
-#define GFX_ARG_STEP_DELAY             29
-#define GFX_ARG_DIRECTION              30
-#define GFX_ARG_POSITION               31
-#define GFX_ARG_DRAW_XOFFSET           32
-#define GFX_ARG_DRAW_YOFFSET           33
-#define GFX_ARG_DRAW_MASKED            34
-#define GFX_ARG_ANIM_DELAY_FIXED       35
-#define GFX_ARG_ANIM_DELAY_RANDOM      36
-#define GFX_ARG_POST_DELAY_FIXED       37
-#define GFX_ARG_POST_DELAY_RANDOM      38
-#define GFX_ARG_NAME                   39
-#define GFX_ARG_SCALE_UP_FACTOR                40
-#define GFX_ARG_TILE_SIZE              41
-#define GFX_ARG_CLONE_FROM             42
-#define GFX_ARG_FADE_MODE              43
-#define GFX_ARG_FADE_DELAY             44
-#define GFX_ARG_POST_DELAY             45
-#define GFX_ARG_AUTO_DELAY             46
-#define GFX_ARG_ALIGN                  47
-#define GFX_ARG_VALIGN                 48
-#define GFX_ARG_SORT_PRIORITY          49
-#define GFX_ARG_CLASS                  50
-#define GFX_ARG_STYLE                  51
-#define GFX_ARG_ACTIVE_XOFFSET         52
-#define GFX_ARG_ACTIVE_YOFFSET         53
-#define GFX_ARG_PRESSED_XOFFSET                54
-#define GFX_ARG_PRESSED_YOFFSET                55
-
-#define NUM_GFX_ARGS                   56
+#define GFX_ARG_STEP_DELAY             28
+#define GFX_ARG_DIRECTION              29
+#define GFX_ARG_POSITION               30
+#define GFX_ARG_DRAW_XOFFSET           31
+#define GFX_ARG_DRAW_YOFFSET           32
+#define GFX_ARG_DRAW_MASKED            33
+#define GFX_ARG_DRAW_ORDER             34
+#define GFX_ARG_INIT_DELAY_FIXED       35
+#define GFX_ARG_INIT_DELAY_RANDOM      36
+#define GFX_ARG_ANIM_DELAY_FIXED       37
+#define GFX_ARG_ANIM_DELAY_RANDOM      38
+#define GFX_ARG_POST_DELAY_FIXED       39
+#define GFX_ARG_POST_DELAY_RANDOM      40
+#define GFX_ARG_NAME                   41
+#define GFX_ARG_SCALE_UP_FACTOR                42
+#define GFX_ARG_TILE_SIZE              43
+#define GFX_ARG_CLONE_FROM             44
+#define GFX_ARG_FADE_MODE              45
+#define GFX_ARG_FADE_DELAY             46
+#define GFX_ARG_POST_DELAY             47
+#define GFX_ARG_AUTO_DELAY             48
+#define GFX_ARG_ALIGN                  49
+#define GFX_ARG_VALIGN                 50
+#define GFX_ARG_SORT_PRIORITY          51
+#define GFX_ARG_CLASS                  52
+#define GFX_ARG_STYLE                  53
+#define GFX_ARG_ACTIVE_XOFFSET         54
+#define GFX_ARG_ACTIVE_YOFFSET         55
+#define GFX_ARG_PRESSED_XOFFSET                56
+#define GFX_ARG_PRESSED_YOFFSET                57
+
+#define NUM_GFX_ARGS                   58
 
 
 /* values for sound configuration suffixes */
@@ -2817,15 +2819,16 @@ struct GraphicInfo
 
   int clone_from;              /* graphic for cloning *all* settings */
 
-  int anim_delay_fixed;                /* optional delay values for bored and   */
-  int anim_delay_random;       /* sleeping player animations (animation */
-  int post_delay_fixed;                /* intervall and following pause before  */
-  int post_delay_random;       /* next intervall (bored animation only) */
+  int init_delay_fixed;                /* optional initial delay values for global */
+  int init_delay_random;       /* animations (pause interval before start) */
+  int anim_delay_fixed;                /* optional delay values for bored/sleeping */
+  int anim_delay_random;       /* and global animations (animation length) */
+  int post_delay_fixed;                /* optional delay values after bored/global */
+  int post_delay_random;       /* animations (pause before next animation) */
 
   int step_offset;             /* optional step offset of toon animations */
   int step_xoffset;            /* optional step offset of toon animations */
   int step_yoffset;            /* optional step offset of toon animations */
-  int step_frames;             /* optional step frames of toon animations */
   int step_delay;              /* optional step delay of toon animations */
   int direction;               /* optional move direction of toon animations */
   int position;                        /* optional draw position of toon animations */
@@ -2836,6 +2839,7 @@ struct GraphicInfo
   int draw_yoffset;            /* optional offset for drawing font chars */
 
   int draw_masked;             /* optional setting for drawing envelope gfx */
+  int draw_order;              /* optional draw order for global animations */
 
   int fade_mode;               /* optional setting for drawing title screens */
   int fade_delay;              /* optional setting for drawing title screens */