X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=cea0249e7d8c480ad79bb38be1285277e4141555;hp=d688627d87903d2bc41555f757dea25c38ebfc37;hb=187654874c567be3a92e0b53aa1df45407432265;hpb=929d04d073dad615dfe2a2c910a0ee10c27793a4

diff --git a/src/main.h b/src/main.h
index d688627d..cea0249e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2359,26 +2359,28 @@
 #define GFX_ARG_POST_DELAY_FIXED	39
 #define GFX_ARG_POST_DELAY_RANDOM	40
 #define GFX_ARG_INIT_EVENT		41
-#define GFX_ARG_ANIM_EVENT		42
-#define GFX_ARG_NAME			43
-#define GFX_ARG_SCALE_UP_FACTOR		44
-#define GFX_ARG_TILE_SIZE		45
-#define GFX_ARG_CLONE_FROM		46
-#define GFX_ARG_FADE_MODE		47
-#define GFX_ARG_FADE_DELAY		48
-#define GFX_ARG_POST_DELAY		49
-#define GFX_ARG_AUTO_DELAY		50
-#define GFX_ARG_ALIGN			51
-#define GFX_ARG_VALIGN			52
-#define GFX_ARG_SORT_PRIORITY		53
-#define GFX_ARG_CLASS			54
-#define GFX_ARG_STYLE			55
-#define GFX_ARG_ACTIVE_XOFFSET		56
-#define GFX_ARG_ACTIVE_YOFFSET		57
-#define GFX_ARG_PRESSED_XOFFSET		58
-#define GFX_ARG_PRESSED_YOFFSET		59
-
-#define NUM_GFX_ARGS			60
+#define GFX_ARG_INIT_EVENT_ACTION	42
+#define GFX_ARG_ANIM_EVENT		43
+#define GFX_ARG_ANIM_EVENT_ACTION	44
+#define GFX_ARG_NAME			45
+#define GFX_ARG_SCALE_UP_FACTOR		46
+#define GFX_ARG_TILE_SIZE		47
+#define GFX_ARG_CLONE_FROM		48
+#define GFX_ARG_FADE_MODE		49
+#define GFX_ARG_FADE_DELAY		50
+#define GFX_ARG_POST_DELAY		51
+#define GFX_ARG_AUTO_DELAY		52
+#define GFX_ARG_ALIGN			53
+#define GFX_ARG_VALIGN			54
+#define GFX_ARG_SORT_PRIORITY		55
+#define GFX_ARG_CLASS			56
+#define GFX_ARG_STYLE			57
+#define GFX_ARG_ACTIVE_XOFFSET		58
+#define GFX_ARG_ACTIVE_YOFFSET		59
+#define GFX_ARG_PRESSED_XOFFSET		60
+#define GFX_ARG_PRESSED_YOFFSET		61
+
+#define NUM_GFX_ARGS			62
 
 
 /* values for sound configuration suffixes */
@@ -2438,8 +2440,9 @@
 #define FONT_GAME_INFO			39
 #define FONT_INFO_ELEMENTS		40
 #define FONT_INFO_LEVELSET		41
+#define FONT_MAIN_NETWORK_PLAYERS	42
 
-#define NUM_FONTS			42
+#define NUM_FONTS			43
 #define NUM_INITIAL_FONTS		4
 
 /* values for toon animation configuration */
@@ -2636,6 +2639,13 @@ struct MenuMainButtonInfo
 
   struct MenuPosInfo prev_level;
   struct MenuPosInfo next_level;
+
+  struct MenuPosInfo first_level;
+  struct MenuPosInfo last_level;
+  struct MenuPosInfo level_number;
+
+  struct MenuPosInfo insert_solution;
+  struct MenuPosInfo play_solution;
 };
 
 struct MenuMainTextInfo
@@ -2675,6 +2685,9 @@ struct MenuMainInfo
   struct MenuMainButtonInfo button;
   struct MenuMainTextInfo text;
   struct MenuMainInputInfo input;
+
+  struct TextPosInfo preview_players;
+  struct TextPosInfo network_players;
 };
 
 struct TitleFadingInfo
@@ -2953,11 +2966,6 @@ struct EnvelopeInfo
   char text[MAX_ENVELOPE_TEXT_LEN + 1];
 };
 
-struct LevelSetInfo
-{
-  int music[MAX_LEVELS];
-};
-
 struct LevelFileInfo
 {
   int nr;
@@ -3403,7 +3411,9 @@ struct GraphicInfo
   int post_delay_random;	/* animations (pause before next animation) */
 
   int init_event;		/* optional event triggering animation start */
+  int init_event_action;	/* optional action called on animation start */
   int anim_event;		/* optional event triggering animation end   */
+  int anim_event_action;	/* optional action called on animation end   */
 
   int step_offset;		/* optional step offset of toon animations */
   int step_xoffset;		/* optional step offset of toon animations */
@@ -3608,7 +3618,6 @@ extern boolean			network_player_action_received;
 
 extern int			graphics_action_mapping[];
 
-extern struct LevelSetInfo	levelset;
 extern struct LevelInfo		level, level_template;
 extern struct HiScore		highscore[];
 extern struct TapeInfo		tape;