X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=092a47e71b5bfbf8a0d44827a9b951b373ef3823;hb=8d67b62445143c8f9fdde2cea730bfee49cc4271;hp=2cbb77f03e99a60a4e051103c78728c5cce3fa05;hpb=8bc9d8febda30d07142948f6b892365d3e11a940;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 2cbb77f0..092a47e7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -870,6 +870,8 @@
 
 #define IS_SPECIAL_GFX_ARG(a)	((a) >= 0 && (a) < NUM_SPECIAL_GFX_ARGS)
 
+#define IS_GLOBAL_ANIM_PART(a)	((a) >= 0 && (a) < NUM_GLOBAL_ANIM_PARTS)
+
 #define EL_CASCADE_ACTIVE(e)	(IS_EDITOR_CASCADE_INACTIVE(e) ? (e) + 1 : (e))
 #define EL_CASCADE_INACTIVE(e)	(IS_EDITOR_CASCADE_ACTIVE(e)   ? (e) - 1 : (e))
 #define EL_CASCADE_TOGGLE(e)	(IS_EDITOR_CASCADE_INACTIVE(e) ? (e) + 1 :    \
@@ -1864,35 +1866,38 @@
 #define GFX_ARG_DIGGABLE_LIKE		23
 #define GFX_ARG_BORDER_SIZE		24
 #define GFX_ARG_STEP_OFFSET		25
-#define GFX_ARG_STEP_DELAY		26
-#define GFX_ARG_DIRECTION		27
-#define GFX_ARG_POSITION		28
-#define GFX_ARG_DRAW_XOFFSET		29
-#define GFX_ARG_DRAW_YOFFSET		30
-#define GFX_ARG_DRAW_MASKED		31
-#define GFX_ARG_ANIM_DELAY_FIXED	32
-#define GFX_ARG_ANIM_DELAY_RANDOM	33
-#define GFX_ARG_POST_DELAY_FIXED	34
-#define GFX_ARG_POST_DELAY_RANDOM	35
-#define GFX_ARG_NAME			36
-#define GFX_ARG_SCALE_UP_FACTOR		37
-#define GFX_ARG_TILE_SIZE		38
-#define GFX_ARG_CLONE_FROM		39
-#define GFX_ARG_FADE_MODE		40
-#define GFX_ARG_FADE_DELAY		41
-#define GFX_ARG_POST_DELAY		42
-#define GFX_ARG_AUTO_DELAY		43
-#define GFX_ARG_ALIGN			44
-#define GFX_ARG_VALIGN			45
-#define GFX_ARG_SORT_PRIORITY		46
-#define GFX_ARG_CLASS			47
-#define GFX_ARG_STYLE			48
-#define GFX_ARG_ACTIVE_XOFFSET		49
-#define GFX_ARG_ACTIVE_YOFFSET		50
-#define GFX_ARG_PRESSED_XOFFSET		51
-#define GFX_ARG_PRESSED_YOFFSET		52
-
-#define NUM_GFX_ARGS			53
+#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
 
 
 /* values for sound configuration suffixes */
@@ -1955,6 +1960,17 @@
 /* values for global animation configuration (must match those from main.c) */
 #define NUM_GLOBAL_ANIMS		8
 #define NUM_GLOBAL_ANIM_PARTS		8
+#define NUM_GLOBAL_ANIM_PARTS_ALL	(NUM_GLOBAL_ANIM_PARTS + 1)
+#define NUM_GLOBAL_ANIM_TOKENS		(2 * NUM_GLOBAL_ANIMS)
+
+#define GLOBAL_ANIM_ID_GRAPHIC_FIRST	0
+#define GLOBAL_ANIM_ID_GRAPHIC_LAST	7
+#define GLOBAL_ANIM_ID_CONTROL_FIRST	(NUM_GLOBAL_ANIMS + 0)
+#define GLOBAL_ANIM_ID_CONTROL_LAST	(NUM_GLOBAL_ANIMS + 7)
+
+#define GLOBAL_ANIM_ID_PART_FIRST	0
+#define GLOBAL_ANIM_ID_PART_LAST	7
+#define GLOBAL_ANIM_ID_PART_BASE	8
 
 /* values for game_status (must match special image configuration suffixes) */
 #define GAME_MODE_DEFAULT		0
@@ -2759,8 +2775,8 @@ struct GlobalAnimInfo
 {
   char *token_name;		/* global animation token in config files */
 
-  /* global animation parts for certain screens */
-  int graphic[NUM_GLOBAL_ANIM_PARTS][NUM_SPECIAL_GFX_ARGS];
+  /* global animation graphic and control definitions */
+  int graphic[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS];
 };
 
 struct GraphicInfo
@@ -2804,7 +2820,14 @@ struct GraphicInfo
   int post_delay_random;	/* next intervall (bored animation only) */
 
   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 */
+  int x;			/* optional draw position of toon animations */
+  int y;			/* optional draw position of toon animations */
 
   int draw_xoffset;		/* optional offset for drawing font chars */
   int draw_yoffset;		/* optional offset for drawing font chars */