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

diff --git a/src/main.h b/src/main.h
index 36500844..cea3c982 100644
--- a/src/main.h
+++ b/src/main.h
@@ -41,8 +41,6 @@
 #define SND_UNDEFINED			(-1)
 #define MUS_UNDEFINED			(-1)
 
-#define DEFAULT_FULLSCREEN_MODE		"800x600"
-
 #define WIN_XSIZE_DEFAULT		672
 #define WIN_YSIZE_DEFAULT		560
 
@@ -1787,27 +1785,38 @@
 #define GFX_SPECIAL_ARG_DEFAULT		0
 #define GFX_SPECIAL_ARG_LOADING		1
 #define GFX_SPECIAL_ARG_TITLE_INITIAL	2
-#define GFX_SPECIAL_ARG_TITLE		3
-#define GFX_SPECIAL_ARG_MAIN		4
-#define GFX_SPECIAL_ARG_LEVELS		5
-#define GFX_SPECIAL_ARG_LEVELNR		6
-#define GFX_SPECIAL_ARG_SCORES		7
-#define GFX_SPECIAL_ARG_EDITOR		8
-#define GFX_SPECIAL_ARG_INFO		9
-#define GFX_SPECIAL_ARG_SETUP		10
-#define GFX_SPECIAL_ARG_PLAYING		11
-#define GFX_SPECIAL_ARG_DOOR		12
-#define GFX_SPECIAL_ARG_TAPE		13
-#define GFX_SPECIAL_ARG_PANEL		14
-#define GFX_SPECIAL_ARG_PREVIEW		15
-#define GFX_SPECIAL_ARG_CRUMBLED	16
-#define GFX_SPECIAL_ARG_TYPENAME	17
-#define GFX_SPECIAL_ARG_MENU		18
-#define GFX_SPECIAL_ARG_TOONS		19
-#define GFX_SPECIAL_ARG_FADING		20
-#define GFX_SPECIAL_ARG_QUIT		21
-
-#define NUM_SPECIAL_GFX_ARGS		22
+#define GFX_SPECIAL_ARG_TITLE_INITIAL_1	3
+#define GFX_SPECIAL_ARG_TITLE_INITIAL_2	4
+#define GFX_SPECIAL_ARG_TITLE_INITIAL_3	5
+#define GFX_SPECIAL_ARG_TITLE_INITIAL_4	6
+#define GFX_SPECIAL_ARG_TITLE_INITIAL_5	7
+#define GFX_SPECIAL_ARG_TITLE		8
+#define GFX_SPECIAL_ARG_TITLE_1		9
+#define GFX_SPECIAL_ARG_TITLE_2		10
+#define GFX_SPECIAL_ARG_TITLE_3		11
+#define GFX_SPECIAL_ARG_TITLE_4		12
+#define GFX_SPECIAL_ARG_TITLE_5		13
+#define GFX_SPECIAL_ARG_MAIN		14
+#define GFX_SPECIAL_ARG_LEVELS		15
+#define GFX_SPECIAL_ARG_LEVELNR		16
+#define GFX_SPECIAL_ARG_SCORES		17
+#define GFX_SPECIAL_ARG_EDITOR		18
+#define GFX_SPECIAL_ARG_INFO		19
+#define GFX_SPECIAL_ARG_SETUP		20
+#define GFX_SPECIAL_ARG_PLAYING		21
+#define GFX_SPECIAL_ARG_DOOR		22
+#define GFX_SPECIAL_ARG_TAPE		23
+#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 NUM_SPECIAL_GFX_ARGS		33
 
 /* these additional definitions are currently only used for draw offsets */
 #define GFX_SPECIAL_ARG_INFO_MAIN	0
@@ -1949,19 +1958,22 @@
 #define FONT_INPUT_2_ACTIVE		24
 #define FONT_INPUT_1			25
 #define FONT_INPUT_2			26
-#define FONT_OPTION_OFF			27
-#define FONT_OPTION_ON			28
-#define FONT_VALUE_1			29
-#define FONT_VALUE_2			30
-#define FONT_VALUE_OLD			31
-#define FONT_LEVEL_NUMBER_ACTIVE	32
-#define FONT_LEVEL_NUMBER		33
-#define FONT_TAPE_RECORDER		34
-#define FONT_GAME_INFO			35
-#define FONT_INFO_ELEMENTS		36
-#define FONT_INFO_LEVELSET		37
-
-#define NUM_FONTS			38
+#define FONT_OPTION_OFF_NARROW		27
+#define FONT_OPTION_OFF			28
+#define FONT_OPTION_ON_NARROW		29
+#define FONT_OPTION_ON			30
+#define FONT_VALUE_1			31
+#define FONT_VALUE_2			32
+#define FONT_VALUE_OLD			33
+#define FONT_VALUE_NARROW		34
+#define FONT_LEVEL_NUMBER_ACTIVE	35
+#define FONT_LEVEL_NUMBER		36
+#define FONT_TAPE_RECORDER		37
+#define FONT_GAME_INFO			38
+#define FONT_INFO_ELEMENTS		39
+#define FONT_INFO_LEVELSET		40
+
+#define NUM_FONTS			41
 #define NUM_INITIAL_FONTS		4
 
 /* values for toon animation configuration */
@@ -1990,27 +2002,38 @@
 #define GAME_MODE_DEFAULT		0
 #define GAME_MODE_LOADING		1
 #define GAME_MODE_TITLE_INITIAL		2
-#define GAME_MODE_TITLE			3
-#define GAME_MODE_MAIN			4
-#define GAME_MODE_LEVELS		5
-#define GAME_MODE_LEVELNR		6
-#define GAME_MODE_SCORES		7
-#define GAME_MODE_EDITOR		8
-#define GAME_MODE_INFO			9
-#define GAME_MODE_SETUP			10
-#define GAME_MODE_PLAYING		11
-#define GAME_MODE_PSEUDO_DOOR		12
-#define GAME_MODE_PSEUDO_TAPE		13
-#define GAME_MODE_PSEUDO_PANEL		14
-#define GAME_MODE_PSEUDO_PREVIEW	15
-#define GAME_MODE_PSEUDO_CRUMBLED	16
-#define GAME_MODE_PSEUDO_TYPENAME	17
-#define GAME_MODE_PSEUDO_MENU		18
-#define GAME_MODE_PSEUDO_TOONS		19
-#define GAME_MODE_PSEUDO_FADING		20
-#define GAME_MODE_QUIT			21
-
-#define NUM_GAME_MODES			22
+#define GAME_MODE_TITLE_INITIAL_1	3
+#define GAME_MODE_TITLE_INITIAL_2	4
+#define GAME_MODE_TITLE_INITIAL_3	5
+#define GAME_MODE_TITLE_INITIAL_4	6
+#define GAME_MODE_TITLE_INITIAL_5	7
+#define GAME_MODE_TITLE			8
+#define GAME_MODE_TITLE_1		9
+#define GAME_MODE_TITLE_2		10
+#define GAME_MODE_TITLE_3		11
+#define GAME_MODE_TITLE_4		12
+#define GAME_MODE_TITLE_5		13
+#define GAME_MODE_MAIN			14
+#define GAME_MODE_LEVELS		15
+#define GAME_MODE_LEVELNR		16
+#define GAME_MODE_SCORES		17
+#define GAME_MODE_EDITOR		18
+#define GAME_MODE_INFO			19
+#define GAME_MODE_SETUP			20
+#define GAME_MODE_PLAYING		21
+#define GAME_MODE_PSEUDO_DOOR		22
+#define GAME_MODE_PSEUDO_TAPE		23
+#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 NUM_GAME_MODES			33
 
 /* special definitions currently only used for custom artwork configuration */
 #define MUSIC_PREFIX_BACKGROUND		0
@@ -2798,6 +2821,9 @@ struct GlobalAnimInfo
 
   /* global animation graphic and control definitions */
   int graphic[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS];
+
+  /* global animation sound definitions */
+  int sound[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS];
 };
 
 struct GraphicInfo