X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=eb7e563babb5095e91f73dc45d6edbd5fbb3b6b7;hb=cacc5129ff29981490cb53d43aeca8264b7f176c;hp=dc1ed99878b7c13665f818d13eabede2d6eb4ea4;hpb=1fcb72cda932d6ce8e528fc40c87262128fa5533;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index dc1ed998..eb7e563b 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1801,8 +1801,14 @@
 #define GFX_SPECIAL_ARG_PANEL		14
 #define GFX_SPECIAL_ARG_PREVIEW		15
 #define GFX_SPECIAL_ARG_CRUMBLED	16
+#define GFX_SPECIAL_ARG_TYPENAME	17
+#define GFX_SPECIAL_ARG_SUBMENU		18
+#define GFX_SPECIAL_ARG_MENU		19
+#define GFX_SPECIAL_ARG_TOONS		20
+#define GFX_SPECIAL_ARG_FADING		21
+#define GFX_SPECIAL_ARG_QUIT		22
 
-#define NUM_SPECIAL_GFX_ARGS		17
+#define NUM_SPECIAL_GFX_ARGS		23
 
 /* these additional definitions are currently only used for draw offsets */
 #define GFX_SPECIAL_ARG_INFO_MAIN	0
@@ -1868,13 +1874,13 @@
 #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_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
@@ -1977,6 +1983,10 @@
 #define GLOBAL_ANIM_ID_PART_LAST	7
 #define GLOBAL_ANIM_ID_PART_BASE	8
 
+/* values for global border graphics */
+#define IMG_GLOBAL_BORDER_FIRST		IMG_GLOBAL_BORDER
+#define IMG_GLOBAL_BORDER_LAST		IMG_GLOBAL_BORDER_PLAYING
+
 /* values for game_status (must match special image configuration suffixes) */
 #define GAME_MODE_DEFAULT		0
 #define GAME_MODE_LOADING		1
@@ -1995,10 +2005,14 @@
 #define GAME_MODE_PSEUDO_PANEL		14
 #define GAME_MODE_PSEUDO_PREVIEW	15
 #define GAME_MODE_PSEUDO_CRUMBLED	16
-
-/* there are no special config file suffixes for these modes */
 #define GAME_MODE_PSEUDO_TYPENAME	17
-#define GAME_MODE_QUIT			18
+#define GAME_MODE_PSEUDO_SUBMENU	18
+#define GAME_MODE_PSEUDO_MENU		19
+#define GAME_MODE_PSEUDO_TOONS		20
+#define GAME_MODE_PSEUDO_FADING		21
+#define GAME_MODE_QUIT			22
+
+#define NUM_GAME_MODES			23
 
 /* special definitions currently only used for custom artwork configuration */
 #define MUSIC_PREFIX_BACKGROUND		0
@@ -2574,6 +2588,10 @@ struct GlobalInfo
   /* global values for fading screens and masking borders */
   int border_status;
 
+  /* values for global animations */
+  int anim_status;
+  int anim_status_next;
+
   boolean use_envelope_request;
 };
 
@@ -2821,15 +2839,14 @@ struct GraphicInfo
 
   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 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 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 */
@@ -2840,6 +2857,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 */