X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=c57461a567a5e30ee4c08e26f6adf21ad70dfb4e;hb=3f878a4e9c28dbb09ab2ed13e972aa2f77ef236e;hp=9e5ab1ac0310143636157c9518829b2a63b7233f;hpb=f2ddf39ad776c01f9b8a57818fe3ea9777649778;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 9e5ab1ac..c57461a5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,13 +20,12 @@
 #include "events.h"
 #include "config.h"
 
-Bitmap		       *bitmap_db_store;
-Bitmap		       *bitmap_db_cross;
 Bitmap		       *bitmap_db_field;
 Bitmap		       *bitmap_db_panel;
 Bitmap		       *bitmap_db_door_1;
 Bitmap		       *bitmap_db_door_2;
-Bitmap		       *bitmap_db_toons;
+Bitmap		       *bitmap_db_store_1;
+Bitmap		       *bitmap_db_store_2;
 DrawBuffer	       *fieldbuffer;
 DrawBuffer	       *drawto_field;
 
@@ -119,6 +118,7 @@ int			ScrollStepSize;
 int			ScreenMovDir = MV_NONE, ScreenMovPos = 0;
 int			ScreenGfxPos = 0;
 int			BorderElement = EL_STEELWALL;
+int			MenuFrameDelay = MENU_FRAME_DELAY;
 int			GameFrameDelay = GAME_FRAME_DELAY;
 int			FfwdFrameDelay = FFWD_FRAME_DELAY;
 int			BX1, BY1;
@@ -144,19 +144,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;
@@ -5643,6 +5649,7 @@ static void print_usage()
 	"  \"autotest LEVELDIR [NR ...]\"     test level tapes for LEVELDIR\n"
 	"  \"autoplay LEVELDIR [NR ...]\"     play level tapes for LEVELDIR\n"
 	"  \"autoffwd LEVELDIR [NR ...]\"     ffwd level tapes for LEVELDIR\n"
+	"  \"autowarp LEVELDIR [NR ...]\"     warp level tapes for LEVELDIR\n"
 	"  \"convert LEVELDIR [NR]\"          convert levels in LEVELDIR\n"
 	"  \"create images DIRECTORY\"        write BMP images to DIRECTORY\n"
 	"  \"create CE image DIRECTORY\"      write BMP image to DIRECTORY\n"