X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=d80ca571f2c1a5173e0f6721af0f8cbb38e6d6c9;hp=cea3c982528be42e849f087ed373acbcc01c59ca;hb=33dadce98a8fe9edfacf51d4e33e7b608883f855;hpb=fdbbb11d5c885a8e70abf796d13f4c54abdafcb9

diff --git a/src/main.h b/src/main.h
index cea3c982..d80ca571 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1809,14 +1809,15 @@
 #define GFX_SPECIAL_ARG_PANEL		24
 #define GFX_SPECIAL_ARG_PREVIEW		25
 #define GFX_SPECIAL_ARG_CRUMBLED	26
-#define GFX_SPECIAL_ARG_TYPENAME	27
-#define GFX_SPECIAL_ARG_SUBMENU		28
-#define GFX_SPECIAL_ARG_MENU		29
-#define GFX_SPECIAL_ARG_TOONS		30
-#define GFX_SPECIAL_ARG_FADING		31
-#define GFX_SPECIAL_ARG_QUIT		32
+#define GFX_SPECIAL_ARG_MAINONLY	27
+#define GFX_SPECIAL_ARG_TYPENAME	28
+#define GFX_SPECIAL_ARG_SUBMENU		29
+#define GFX_SPECIAL_ARG_MENU		30
+#define GFX_SPECIAL_ARG_TOONS		31
+#define GFX_SPECIAL_ARG_FADING		32
+#define GFX_SPECIAL_ARG_QUIT		33
 
-#define NUM_SPECIAL_GFX_ARGS		33
+#define NUM_SPECIAL_GFX_ARGS		34
 
 /* these additional definitions are currently only used for draw offsets */
 #define GFX_SPECIAL_ARG_INFO_MAIN	0
@@ -2026,14 +2027,15 @@
 #define GAME_MODE_PSEUDO_PANEL		24
 #define GAME_MODE_PSEUDO_PREVIEW	25
 #define GAME_MODE_PSEUDO_CRUMBLED	26
-#define GAME_MODE_PSEUDO_TYPENAME	27
-#define GAME_MODE_PSEUDO_SUBMENU	28
-#define GAME_MODE_PSEUDO_MENU		29
-#define GAME_MODE_PSEUDO_TOONS		30
-#define GAME_MODE_PSEUDO_FADING		31
-#define GAME_MODE_QUIT			32
+#define GAME_MODE_PSEUDO_MAINONLY	27
+#define GAME_MODE_PSEUDO_TYPENAME	28
+#define GAME_MODE_PSEUDO_SUBMENU	29
+#define GAME_MODE_PSEUDO_MENU		30
+#define GAME_MODE_PSEUDO_TOONS		31
+#define GAME_MODE_PSEUDO_FADING		32
+#define GAME_MODE_QUIT			33
 
-#define NUM_GAME_MODES			33
+#define NUM_GAME_MODES			34
 
 /* special definitions currently only used for custom artwork configuration */
 #define MUSIC_PREFIX_BACKGROUND		0
@@ -2049,12 +2051,13 @@
 #define PROGRAM_VERSION_MINOR		0
 #define PROGRAM_VERSION_PATCH		0
 #define PROGRAM_VERSION_BUILD		0
+#define PROGRAM_VERSION_EXTRA		" RC3"
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
 #define PROGRAM_EMAIL_STRING		"info@artsoft.org"
 #define PROGRAM_WEBSITE_STRING		"http://www.artsoft.org/"
-#define PROGRAM_COPYRIGHT_STRING	"Copyright \xa9""1995-2015 by Holger Schemel"
+#define PROGRAM_COPYRIGHT_STRING	"Copyright \xa9""1995-2016 by Holger Schemel"
 #define PROGRAM_COMPANY_STRING		"A Game by Artsoft Entertainment"
 
 #define PROGRAM_ICON_FILENAME		"RocksIcon32x32.png"
@@ -2822,8 +2825,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
@@ -2969,13 +2973,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;
 
@@ -3055,6 +3058,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;
@@ -3080,19 +3084,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;