X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=4d2707e982af72a67575e7f4636bd4c27fb99550;hp=71cc74d617c182e3ea55d6f5c6e1b562b9b51d13;hb=61a2ef633881ce5e865c8747f6393700c870f675;hpb=da028195db34242cd7a82d82de768109963509cb

diff --git a/src/main.c b/src/main.c
index 71cc74d6..4d2707e9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,6 @@ Bitmap		       *bitmap_db_field;
 Bitmap		       *bitmap_db_panel;
 Bitmap		       *bitmap_db_door_1;
 Bitmap		       *bitmap_db_door_2;
-Bitmap		       *bitmap_db_toons;
 DrawBuffer	       *fieldbuffer;
 DrawBuffer	       *drawto_field;
 
@@ -144,19 +143,25 @@ struct GlobalInfo	global;
 struct BorderInfo	border;
 struct ViewportInfo	viewport;
 struct TitleFadingInfo	fading;
+struct TitleFadingInfo	title_initial_first_default;
 struct TitleFadingInfo	title_initial_default;
+struct TitleFadingInfo	title_first_default;
 struct TitleFadingInfo	title_default;
-struct TitleMessageInfo	titlescreen_initial_default;
+struct TitleMessageInfo	titlescreen_initial_first_default;
 struct TitleMessageInfo	titlescreen_initial_first[MAX_NUM_TITLE_IMAGES];
+struct TitleMessageInfo	titlescreen_initial_default;
 struct TitleMessageInfo	titlescreen_initial[MAX_NUM_TITLE_IMAGES];
-struct TitleMessageInfo	titlescreen_default;
+struct TitleMessageInfo	titlescreen_first_default;
 struct TitleMessageInfo	titlescreen_first[MAX_NUM_TITLE_IMAGES];
+struct TitleMessageInfo	titlescreen_default;
 struct TitleMessageInfo	titlescreen[MAX_NUM_TITLE_IMAGES];
-struct TitleMessageInfo	titlemessage_initial_default;
+struct TitleMessageInfo	titlemessage_initial_first_default;
 struct TitleMessageInfo	titlemessage_initial_first[MAX_NUM_TITLE_MESSAGES];
+struct TitleMessageInfo	titlemessage_initial_default;
 struct TitleMessageInfo	titlemessage_initial[MAX_NUM_TITLE_MESSAGES];
-struct TitleMessageInfo	titlemessage_default;
+struct TitleMessageInfo	titlemessage_first_default;
 struct TitleMessageInfo	titlemessage_first[MAX_NUM_TITLE_MESSAGES];
+struct TitleMessageInfo	titlemessage_default;
 struct TitleMessageInfo	titlemessage[MAX_NUM_TITLE_MESSAGES];
 struct TitleMessageInfo	readme;
 struct InitInfo		init, init_last;
@@ -5499,6 +5504,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".PANEL",			GFX_SPECIAL_ARG_PANEL,			},
   { ".PREVIEW",			GFX_SPECIAL_ARG_PREVIEW,		},
   { ".CRUMBLED",		GFX_SPECIAL_ARG_CRUMBLED,		},
+  { ".MAINONLY",		GFX_SPECIAL_ARG_MAINONLY,		},
   { ".TYPENAME",		GFX_SPECIAL_ARG_TYPENAME,		},
   { ".SUBMENU",			GFX_SPECIAL_ARG_SUBMENU,		},
   { ".MENU",			GFX_SPECIAL_ARG_MENU,			},
@@ -5573,14 +5579,14 @@ struct FontInfo font_info[NUM_FONTS + 1] =
 struct GlobalAnimInfo global_anim_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
 {
   /* (real) graphic definitions used to define animation graphics */
-  { "global.anim_1.gfx",	},
-  { "global.anim_2.gfx",	},
-  { "global.anim_3.gfx",	},
-  { "global.anim_4.gfx",	},
-  { "global.anim_5.gfx",	},
-  { "global.anim_6.gfx",	},
-  { "global.anim_7.gfx",	},
-  { "global.anim_8.gfx",	},
+  { "gfx.global.anim_1",	},
+  { "gfx.global.anim_2",	},
+  { "gfx.global.anim_3",	},
+  { "gfx.global.anim_4",	},
+  { "gfx.global.anim_5",	},
+  { "gfx.global.anim_6",	},
+  { "gfx.global.anim_7",	},
+  { "gfx.global.anim_8",	},
 
   /* (dummy) graphic definitions used to define animation controls */
   { "global.anim_1",		},
@@ -5651,12 +5657,13 @@ static void print_usage()
 
 static void print_version()
 {
-  Print("%s %d.%d.%d.%d\n",
+  Print("%s %d.%d.%d.%d%s\n",
 	PROGRAM_TITLE_STRING,
 	PROGRAM_VERSION_MAJOR,
 	PROGRAM_VERSION_MINOR,
 	PROGRAM_VERSION_PATCH,
-	PROGRAM_VERSION_BUILD);
+	PROGRAM_VERSION_BUILD,
+	PROGRAM_VERSION_EXTRA);
 
   if (options.debug)
   {