X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=3dee9b39d6df2c0a2eb1ec315cafc076b433e17f;hb=d6d1c9d93fa318a7e49304f008dd6a965a5dc48c;hp=b4a34769c919bac28055650ab075c74d43c96728;hpb=8b04d496646e102dd15710ba091e2f37cadcec5e;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index b4a34769..3dee9b39 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1599,6 +1599,17 @@
 
 #define NUM_SPECIAL_GFX_ARGS		12
 
+/* these additional definitions are currently only used for draw offsets */
+#define GFX_SPECIAL_ARG_INFO_MAIN	0
+#define GFX_SPECIAL_ARG_INFO_TITLE	1
+#define GFX_SPECIAL_ARG_INFO_ELEMENTS	2
+#define GFX_SPECIAL_ARG_INFO_MUSIC	3
+#define GFX_SPECIAL_ARG_INFO_CREDITS	4
+#define GFX_SPECIAL_ARG_INFO_PROGRAM	5
+#define GFX_SPECIAL_ARG_INFO_LEVELSET	6
+
+#define NUM_SPECIAL_GFX_INFO_ARGS	7
+
 
 /* values for image configuration suffixes */
 #define GFX_ARG_X			0
@@ -1658,44 +1669,59 @@
 #define NUM_MUS_ARGS			1
 
 
-/* values for font configuration */
+/* values for font configuration (definitions must match those from main.c) */
 #define FONT_INITIAL_1			0
 #define FONT_INITIAL_2			1
 #define FONT_INITIAL_3			2
 #define FONT_INITIAL_4			3
 #define FONT_TITLE_1			4
 #define FONT_TITLE_2			5
-#define FONT_MENU_1			6
-#define FONT_MENU_2			7
-#define FONT_TEXT_1_ACTIVE		8
-#define FONT_TEXT_2_ACTIVE		9
-#define FONT_TEXT_3_ACTIVE		10
-#define FONT_TEXT_4_ACTIVE		11
-#define FONT_TEXT_1			12
-#define FONT_TEXT_2			13
-#define FONT_TEXT_3			14
-#define FONT_TEXT_4			15
-#define FONT_ENVELOPE_1			16
-#define FONT_ENVELOPE_2			17
-#define FONT_ENVELOPE_3			18
-#define FONT_ENVELOPE_4			19
-#define FONT_INPUT_1_ACTIVE		20
-#define FONT_INPUT_2_ACTIVE		21
-#define FONT_INPUT_1			22
-#define FONT_INPUT_2			23
-#define FONT_OPTION_OFF			24
-#define FONT_OPTION_ON			25
-#define FONT_VALUE_1			26
-#define FONT_VALUE_2			27
-#define FONT_VALUE_OLD			28
-#define FONT_LEVEL_NUMBER_ACTIVE	29
-#define FONT_LEVEL_NUMBER		30
-#define FONT_TAPE_RECORDER		31
-#define FONT_GAME_INFO			32
-
-#define NUM_FONTS			33
+#define FONT_MENU_1_ACTIVE		6
+#define FONT_MENU_2_ACTIVE		7
+#define FONT_MENU_1			8
+#define FONT_MENU_2			9
+#define FONT_TEXT_1_ACTIVE		10
+#define FONT_TEXT_2_ACTIVE		11
+#define FONT_TEXT_3_ACTIVE		12
+#define FONT_TEXT_4_ACTIVE		13
+#define FONT_TEXT_1			14
+#define FONT_TEXT_2			15
+#define FONT_TEXT_3			16
+#define FONT_TEXT_4			17
+#define FONT_ENVELOPE_1			18
+#define FONT_ENVELOPE_2			19
+#define FONT_ENVELOPE_3			20
+#define FONT_ENVELOPE_4			21
+#define FONT_INPUT_1_ACTIVE		22
+#define FONT_INPUT_2_ACTIVE		23
+#define FONT_INPUT_1			24
+#define FONT_INPUT_2			25
+#define FONT_OPTION_OFF			26
+#define FONT_OPTION_ON			27
+#define FONT_VALUE_1			28
+#define FONT_VALUE_2			29
+#define FONT_VALUE_OLD			30
+#define FONT_LEVEL_NUMBER_ACTIVE	31
+#define FONT_LEVEL_NUMBER		32
+#define FONT_TAPE_RECORDER		33
+#define FONT_GAME_INFO			34
+
+#define NUM_FONTS			35
 #define NUM_INITIAL_FONTS		4
 
+#define FONT_ACTIVE(f)							  \
+	((f) == FONT_MENU_1		? FONT_MENU_1_ACTIVE		: \
+	 (f) == FONT_MENU_2		? FONT_MENU_2_ACTIVE		: \
+	 (f) == FONT_TEXT_1		? FONT_TEXT_1_ACTIVE		: \
+	 (f) == FONT_TEXT_2		? FONT_TEXT_2_ACTIVE		: \
+	 (f) == FONT_TEXT_3		? FONT_TEXT_3_ACTIVE		: \
+	 (f) == FONT_TEXT_4		? FONT_TEXT_4_ACTIVE		: \
+	 (f) == FONT_INPUT_1		? FONT_INPUT_1_ACTIVE		: \
+	 (f) == FONT_INPUT_2		? FONT_INPUT_2_ACTIVE		: \
+	 (f) == FONT_LEVEL_NUMBER	? FONT_LEVEL_NUMBER_ACTIVE	: \
+	 (f))
+
+
 /* values for game_status (must match special image configuration suffixes) */
 #define GAME_MODE_DEFAULT		0
 #define GAME_MODE_TITLE			1
@@ -1820,10 +1846,57 @@ struct BorderInfo
   int draw_masked[NUM_SPECIAL_GFX_ARGS];
 };
 
+struct MenuMainButtonInfo
+{
+  struct Rect name;
+  struct Rect levels;
+  struct Rect scores;
+  struct Rect editor;
+  struct Rect info;
+  struct Rect game;
+  struct Rect setup;
+  struct Rect quit;
+
+  struct Rect prev_level;
+  struct Rect next_level;
+};
+
+struct MenuMainTextInfo
+{
+  struct Rect name;
+  struct Rect levels;
+  struct Rect scores;
+  struct Rect editor;
+  struct Rect info;
+  struct Rect game;
+  struct Rect setup;
+  struct Rect quit;
+
+  struct Rect current_level;
+  struct Rect first_level;
+  struct Rect last_level;
+  struct Rect level_info_1;
+  struct Rect level_info_2;
+};
+
+struct MenuMainInputInfo
+{
+  struct Rect name;
+};
+
+struct MenuMainInfo
+{
+  struct MenuMainButtonInfo button;
+  struct MenuMainTextInfo text;
+  struct MenuMainInputInfo input;
+};
+
 struct MenuInfo
 {
   int draw_xoffset[NUM_SPECIAL_GFX_ARGS];
   int draw_yoffset[NUM_SPECIAL_GFX_ARGS];
+  int draw_xoffset_info[NUM_SPECIAL_GFX_INFO_ARGS];
+  int draw_yoffset_info[NUM_SPECIAL_GFX_INFO_ARGS];
 
   int scrollbar_xoffset;
 
@@ -1834,6 +1907,8 @@ struct MenuInfo
 
   int sound[NUM_SPECIAL_GFX_ARGS];
   int music[NUM_SPECIAL_GFX_ARGS];
+
+  struct MenuMainInfo main;
 };
 
 struct DoorInfo
@@ -1849,6 +1924,7 @@ struct PreviewInfo
 {
   int x, y;
   int xsize, ysize;
+  int xoffset, yoffset;
   int tile_size;
   int step_offset;
   int step_delay;