X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=566e0069739f5b8d5e67f884c7d2e14b9febce1b;hp=f61c4edc85d58372aedbd126a0f8584a8b3ed6f0;hb=65dcb102effc9b2dd3b45df14fc35b3f224b79c6;hpb=2176d1de29652bc9e8db1baa283fdc1c4e99e674

diff --git a/src/main.h b/src/main.h
index f61c4edc..566e0069 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2051,7 +2051,7 @@
 #define PROGRAM_VERSION_MINOR		0
 #define PROGRAM_VERSION_PATCH		0
 #define PROGRAM_VERSION_BUILD		0
-#define PROGRAM_VERSION_EXTRA		" RC1"
+#define PROGRAM_VERSION_EXTRA		" RC3"
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
@@ -2122,9 +2122,19 @@
 #define NUM_ENGINE_TYPES		4
 
 /* values for automatically playing tapes */
-#define AUTOPLAY_TEST			0
-#define AUTOPLAY_PLAY			1
-#define AUTOPLAY_FFWD			2
+#define AUTOPLAY_NONE			0
+#define AUTOPLAY_PLAY			(1 << 0)
+#define AUTOPLAY_FFWD			(1 << 1)
+#define AUTOPLAY_WARP			(1 << 2)
+#define AUTOPLAY_TEST			(1 << 3)
+#define AUTOPLAY_WARP_NO_DISPLAY	AUTOPLAY_TEST
+
+#define AUTOPLAY_MODE_NONE		0
+#define AUTOPLAY_MODE_PLAY		(AUTOPLAY_MODE_NONE | AUTOPLAY_PLAY)
+#define AUTOPLAY_MODE_FFWD		(AUTOPLAY_MODE_PLAY | AUTOPLAY_FFWD)
+#define AUTOPLAY_MODE_WARP		(AUTOPLAY_MODE_FFWD | AUTOPLAY_WARP)
+#define AUTOPLAY_MODE_TEST		(AUTOPLAY_MODE_WARP | AUTOPLAY_TEST)
+#define AUTOPLAY_MODE_WARP_NO_DISPLAY	AUTOPLAY_MODE_TEST
 
 
 struct BorderInfo
@@ -2825,8 +2835,9 @@ struct GlobalAnimInfo
   /* global animation graphic and control definitions */
   int graphic[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS];
 
-  /* global animation sound definitions */
+  /* global animation sound and music definitions */
   int sound[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS];
+  int music[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS];
 };
 
 struct GraphicInfo
@@ -2972,13 +2983,12 @@ struct HelpAnimInfo
 };
 
 
-extern Bitmap		       *bitmap_db_store;
-extern Bitmap		       *bitmap_db_cross;
 extern Bitmap		       *bitmap_db_field;
 extern Bitmap		       *bitmap_db_panel;
 extern Bitmap		       *bitmap_db_door_1;
 extern Bitmap		       *bitmap_db_door_2;
-extern Bitmap		       *bitmap_db_toons;
+extern Bitmap		       *bitmap_db_store_1;
+extern Bitmap		       *bitmap_db_store_2;
 extern DrawBuffer	       *fieldbuffer;
 extern DrawBuffer	       *drawto_field;
 
@@ -3058,6 +3068,7 @@ extern int			FX, FY;
 extern int			ScrollStepSize;
 extern int			ScreenMovDir, ScreenMovPos, ScreenGfxPos;
 extern int			BorderElement;
+extern int			MenuFrameDelay;
 extern int			GameFrameDelay;
 extern int			FfwdFrameDelay;
 extern int			BX1, BY1;
@@ -3083,19 +3094,25 @@ extern struct BorderInfo	border;
 extern struct ViewportInfo	viewport;
 extern struct TitleFadingInfo	fading;
 extern struct TitleFadingInfo	fading_none;
+extern struct TitleFadingInfo	title_initial_first_default;
 extern struct TitleFadingInfo	title_initial_default;
+extern struct TitleFadingInfo	title_first_default;
 extern struct TitleFadingInfo	title_default;
-extern struct TitleMessageInfo	titlescreen_initial_default;
+extern struct TitleMessageInfo	titlescreen_initial_first_default;
 extern struct TitleMessageInfo	titlescreen_initial_first[];
+extern struct TitleMessageInfo	titlescreen_initial_default;
 extern struct TitleMessageInfo	titlescreen_initial[];
-extern struct TitleMessageInfo	titlescreen_default;
+extern struct TitleMessageInfo	titlescreen_first_default;
 extern struct TitleMessageInfo	titlescreen_first[];
+extern struct TitleMessageInfo	titlescreen_default;
 extern struct TitleMessageInfo	titlescreen[];
-extern struct TitleMessageInfo	titlemessage_initial_default;
+extern struct TitleMessageInfo	titlemessage_initial_first_default;
 extern struct TitleMessageInfo	titlemessage_initial_first[];
+extern struct TitleMessageInfo	titlemessage_initial_default;
 extern struct TitleMessageInfo	titlemessage_initial[];
-extern struct TitleMessageInfo	titlemessage_default;
+extern struct TitleMessageInfo	titlemessage_first_default;
 extern struct TitleMessageInfo	titlemessage_first[];
+extern struct TitleMessageInfo	titlemessage_default;
 extern struct TitleMessageInfo	titlemessage[];
 extern struct TitleMessageInfo	readme;
 extern struct InitInfo		init, init_last;