X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=496bfaabea1defccddf5b650ef291fcfe961124a;hb=cea1ea492e56f8816aa76b3d59ae44c4f3b73339;hp=1e97b9c902fe938d221b83177fb2b1ce14072b0f;hpb=d84b80f3e24a3b3e5537d7636ea2ad9809612214;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 1e97b9c9..496bfaab 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
 
@@ -1801,8 +1799,14 @@
 #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_SUBMENU		18
+#define GFX_SPECIAL_ARG_MENU		19
+#define GFX_SPECIAL_ARG_TOONS		20
+#define GFX_SPECIAL_ARG_FADING		21
+#define GFX_SPECIAL_ARG_QUIT		22
 
-#define NUM_SPECIAL_GFX_ARGS		17
+#define NUM_SPECIAL_GFX_ARGS		23
 
 /* these additional definitions are currently only used for draw offsets */
 #define GFX_SPECIAL_ARG_INFO_MAIN	0
@@ -1944,19 +1948,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 */
@@ -1977,6 +1984,10 @@
 #define GLOBAL_ANIM_ID_PART_LAST	7
 #define GLOBAL_ANIM_ID_PART_BASE	8
 
+/* values for global border graphics */
+#define IMG_GLOBAL_BORDER_FIRST		IMG_GLOBAL_BORDER
+#define IMG_GLOBAL_BORDER_LAST		IMG_GLOBAL_BORDER_PLAYING
+
 /* values for game_status (must match special image configuration suffixes) */
 #define GAME_MODE_DEFAULT		0
 #define GAME_MODE_LOADING		1
@@ -1995,10 +2006,14 @@
 #define GAME_MODE_PSEUDO_PANEL		14
 #define GAME_MODE_PSEUDO_PREVIEW	15
 #define GAME_MODE_PSEUDO_CRUMBLED	16
-
-/* there are no special config file suffixes for these modes */
 #define GAME_MODE_PSEUDO_TYPENAME	17
-#define GAME_MODE_QUIT			18
+#define GAME_MODE_PSEUDO_SUBMENU	18
+#define GAME_MODE_PSEUDO_MENU		19
+#define GAME_MODE_PSEUDO_TOONS		20
+#define GAME_MODE_PSEUDO_FADING		21
+#define GAME_MODE_QUIT			22
+
+#define NUM_GAME_MODES			23
 
 /* special definitions currently only used for custom artwork configuration */
 #define MUSIC_PREFIX_BACKGROUND		0
@@ -2574,6 +2589,10 @@ struct GlobalInfo
   /* global values for fading screens and masking borders */
   int border_status;
 
+  /* values for global animations */
+  int anim_status;
+  int anim_status_next;
+
   boolean use_envelope_request;
 };