X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=566e0069739f5b8d5e67f884c7d2e14b9febce1b;hb=f85e877642f788205d1414ab1f7eee29679386e6;hp=2478a9d06ed30f8b67cd565a7d4c3612992eab22;hpb=61a2ef633881ce5e865c8747f6393700c870f675;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 2478a9d0..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		" RC2"
+#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,12 +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_store_1;
+extern Bitmap		       *bitmap_db_store_2;
 extern DrawBuffer	       *fieldbuffer;
 extern DrawBuffer	       *drawto_field;
 
@@ -3057,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;