X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=11ee9c0fb79ee6465a938610c3e75778abaeffe9;hb=2f8bd98e428f73379a9173ccc9f7d03c885d641a;hp=29858c32dcef67d2f7b7d42f2ecd0e4efb874158;hpb=9f7cd608c28ded86b2c2e649c776220ae27df038;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 29858c32..11ee9c0f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1722,20 +1722,18 @@
 #define GFX_SPECIAL_ARG_DEFAULT		0
 #define GFX_SPECIAL_ARG_TITLE_INITIAL	1
 #define GFX_SPECIAL_ARG_TITLE		2
-#define GFX_SPECIAL_ARG_MESSAGE_INITIAL	3
-#define GFX_SPECIAL_ARG_MESSAGE		4
-#define GFX_SPECIAL_ARG_MAIN		5
-#define GFX_SPECIAL_ARG_LEVELS		6
-#define GFX_SPECIAL_ARG_SCORES		7
-#define GFX_SPECIAL_ARG_EDITOR		8
-#define GFX_SPECIAL_ARG_INFO		9
-#define GFX_SPECIAL_ARG_SETUP		10
-#define GFX_SPECIAL_ARG_PLAYING		11
-#define GFX_SPECIAL_ARG_DOOR		12
-#define GFX_SPECIAL_ARG_PREVIEW		13
-#define GFX_SPECIAL_ARG_CRUMBLED	14
-
-#define NUM_SPECIAL_GFX_ARGS		15
+#define GFX_SPECIAL_ARG_MAIN		3
+#define GFX_SPECIAL_ARG_LEVELS		4
+#define GFX_SPECIAL_ARG_SCORES		5
+#define GFX_SPECIAL_ARG_EDITOR		6
+#define GFX_SPECIAL_ARG_INFO		7
+#define GFX_SPECIAL_ARG_SETUP		8
+#define GFX_SPECIAL_ARG_PLAYING		9
+#define GFX_SPECIAL_ARG_DOOR		10
+#define GFX_SPECIAL_ARG_PREVIEW		11
+#define GFX_SPECIAL_ARG_CRUMBLED	12
+
+#define NUM_SPECIAL_GFX_ARGS		13
 
 /* these additional definitions are currently only used for draw offsets */
 #define GFX_SPECIAL_ARG_INFO_MAIN	0
@@ -1873,22 +1871,20 @@
 #define GAME_MODE_DEFAULT		0
 #define GAME_MODE_TITLE_INITIAL		1
 #define GAME_MODE_TITLE			2
-#define GAME_MODE_MESSAGE_INITIAL	3
-#define GAME_MODE_MESSAGE		4
-#define GAME_MODE_MAIN			5
-#define GAME_MODE_LEVELS		6
-#define GAME_MODE_SCORES		7
-#define GAME_MODE_EDITOR		8
-#define GAME_MODE_INFO			9
-#define GAME_MODE_SETUP			10
-#define GAME_MODE_PLAYING		11
-#define GAME_MODE_PSEUDO_DOOR		12
-#define GAME_MODE_PSEUDO_PREVIEW	13
-#define GAME_MODE_PSEUDO_CRUMBLED	14
+#define GAME_MODE_MAIN			3
+#define GAME_MODE_LEVELS		4
+#define GAME_MODE_SCORES		5
+#define GAME_MODE_EDITOR		6
+#define GAME_MODE_INFO			7
+#define GAME_MODE_SETUP			8
+#define GAME_MODE_PLAYING		9
+#define GAME_MODE_PSEUDO_DOOR		10
+#define GAME_MODE_PSEUDO_PREVIEW	11
+#define GAME_MODE_PSEUDO_CRUMBLED	12
 
 /* there are no special config file suffixes for these modes */
-#define GAME_MODE_PSEUDO_TYPENAME	15
-#define GAME_MODE_QUIT			16
+#define GAME_MODE_PSEUDO_TYPENAME	13
+#define GAME_MODE_QUIT			14
 
 /* special definitions currently only used for custom artwork configuration */
 #define MUSIC_PREFIX_BACKGROUND		0
@@ -2051,15 +2047,12 @@ struct MenuMainInfo
   struct MenuMainInputInfo input;
 };
 
-struct TitleInfo
+struct TitleFadingInfo
 {
+  int anim_mode;
   int fade_delay;
   int post_delay;
   int auto_delay;
-
-  int fade_delay_final;
-  int post_delay_final;
-  int auto_delay_final;
 };
 
 struct TitleMessageInfo
@@ -2071,8 +2064,13 @@ struct TitleMessageInfo
   int font;
   boolean autowrap;
   boolean centered;
-  boolean skip_comments;
+  boolean parse_comments;
   int sort_priority;
+
+  int anim_mode;
+  int fade_delay;
+  int post_delay;
+  int auto_delay;
 };
 
 struct MenuInfo
@@ -2086,9 +2084,8 @@ struct MenuInfo
 
   int list_size[NUM_SPECIAL_GFX_ARGS];
 
-  int fade_delay;
-  int post_delay;
-  int auto_delay;
+  struct TitleFadingInfo navigation;
+  struct TitleFadingInfo destination;
 
   int sound[NUM_SPECIAL_GFX_ARGS];
   int music[NUM_SPECIAL_GFX_ARGS];
@@ -2688,8 +2685,12 @@ extern struct HiScore		highscore[];
 extern struct TapeInfo		tape;
 extern struct GlobalInfo	global;
 extern struct BorderInfo	border;
-extern struct TitleInfo		title;
+extern struct TitleFadingInfo	fading;
+extern struct TitleFadingInfo	title_initial_default;
+extern struct TitleFadingInfo	title_default;
+extern struct TitleMessageInfo	titlemessage_initial_default;
 extern struct TitleMessageInfo	titlemessage_initial[];
+extern struct TitleMessageInfo	titlemessage_default;
 extern struct TitleMessageInfo	titlemessage[];
 extern struct TitleMessageInfo	readme;
 extern struct MenuInfo		menu;