X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=eb6b438688736b525534e15efd4dd11a5eecbcc4;hb=e77c26313b1a1e3ddd884cdda005cb6758c1a100;hp=97e8ff19ca7b478ae7ecbb1bed9dbf319fff6416;hpb=9fd0f69468128f9083268835c3098eb7085a14dd;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 97e8ff19..eb6b4386 100644
--- a/src/main.h
+++ b/src/main.h
@@ -838,6 +838,11 @@
 				 (d) == MV_UP    ? "MV_UP"    :		\
 				 (d) == MV_DOWN  ? "MV_DOWN"  : "(various)")
 
+#define ELEMENT_ACTIVE(e)	(ActiveElement[e])
+
+#define FONT_ACTIVE(f)		(ActiveFont[f])
+
+
 /* fundamental game speed values */
 #define MICROLEVEL_SCROLL_DELAY	50	/* delay for scrolling micro level */
 #define MICROLEVEL_LABEL_DELAY	250	/* delay for micro level label */
@@ -1734,10 +1739,11 @@
 #define GFX_SPECIAL_ARG_SETUP		8
 #define GFX_SPECIAL_ARG_PLAYING		9
 #define GFX_SPECIAL_ARG_DOOR		10
-#define GFX_SPECIAL_ARG_PREVIEW		11
-#define GFX_SPECIAL_ARG_CRUMBLED	12
+#define GFX_SPECIAL_ARG_PANEL		11
+#define GFX_SPECIAL_ARG_PREVIEW		12
+#define GFX_SPECIAL_ARG_CRUMBLED	13
 
-#define NUM_SPECIAL_GFX_ARGS		13
+#define NUM_SPECIAL_GFX_ARGS		14
 
 /* these additional definitions are currently only used for draw offsets */
 #define GFX_SPECIAL_ARG_INFO_MAIN	0
@@ -1859,6 +1865,7 @@
 #define NUM_FONTS			37
 #define NUM_INITIAL_FONTS		4
 
+#if 0
 #define FONT_ACTIVE(f)							  \
 	((f) == FONT_MENU_1		? FONT_MENU_1_ACTIVE		: \
 	 (f) == FONT_MENU_2		? FONT_MENU_2_ACTIVE		: \
@@ -1870,7 +1877,7 @@
 	 (f) == FONT_INPUT_2		? FONT_INPUT_2_ACTIVE		: \
 	 (f) == FONT_LEVEL_NUMBER	? FONT_LEVEL_NUMBER_ACTIVE	: \
 	 (f))
-
+#endif
 
 /* values for game_status (must match special image configuration suffixes) */
 #define GAME_MODE_DEFAULT		0
@@ -1884,12 +1891,13 @@
 #define GAME_MODE_SETUP			8
 #define GAME_MODE_PLAYING		9
 #define GAME_MODE_PSEUDO_DOOR		10
-#define GAME_MODE_PSEUDO_PREVIEW	11
-#define GAME_MODE_PSEUDO_CRUMBLED	12
+#define GAME_MODE_PSEUDO_PANEL		11
+#define GAME_MODE_PSEUDO_PREVIEW	12
+#define GAME_MODE_PSEUDO_CRUMBLED	13
 
 /* there are no special config file suffixes for these modes */
-#define GAME_MODE_PSEUDO_TYPENAME	13
-#define GAME_MODE_QUIT			14
+#define GAME_MODE_PSEUDO_TYPENAME	14
+#define GAME_MODE_QUIT			15
 
 /* special definitions currently only used for custom artwork configuration */
 #define MUSIC_PREFIX_BACKGROUND		0
@@ -2665,6 +2673,9 @@ extern int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int 			GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
+extern int			ActiveElement[MAX_NUM_ELEMENTS];
+extern int			ActiveFont[NUM_FONTS];
+
 extern int			lev_fieldx, lev_fieldy;
 extern int			scroll_x, scroll_y;