X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=1e62cc61186a8ab658c32be77c43875a7ff6d2ab;hb=872cf2d86e73d185fcad1fac7b389e7d1dfcb839;hp=0ca05c7c94b7256f191fb4a398f37df8b084f730;hpb=0d03b05bd2b0faf67444063af59c3b0fef45dd09;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 0ca05c7c..1e62cc61 100644
--- a/src/main.h
+++ b/src/main.h
@@ -56,6 +56,10 @@
 #define MAX_LEV_FIELDX			MAX_PLAYFIELD_WIDTH
 #define MAX_LEV_FIELDY			MAX_PLAYFIELD_HEIGHT
 
+#define MIN_SCROLL_DELAY		0
+#define STD_SCROLL_DELAY		3
+#define MAX_SCROLL_DELAY		8
+
 #define SCREENX(a)			((a) - scroll_x)
 #define SCREENY(a)			((a) - scroll_y)
 #define LEVELX(a)			((a) + scroll_x)
@@ -649,7 +653,7 @@
 #define EM_KEY_NR(e)		((e) - EL_EM_KEY_1)
 #define EMC_KEY_NR(e)		((e) - EL_EMC_KEY_5 + 4)
 #define KEY_NR(e)		(IS_RND_KEY(e) ? RND_KEY_NR(e) :	\
-				 IS_EM_KEY(e) ?  EM_KEY_NR(e) :		\
+				 IS_EM_KEY(e)  ? EM_KEY_NR(e)  :	\
 				 IS_EMC_KEY(e) ? EMC_KEY_NR(e) : 0)
 
 #define IS_RND_GATE(e)		((e) >= EL_GATE_1 &&			\
@@ -834,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 */
@@ -849,8 +858,6 @@
 
 #define MAX_NUM_AMOEBA		100
 
-#define NUM_BELTS		4
-#define NUM_BELT_PARTS		3
 #define NUM_ENVELOPES		4
 #define MIN_ENVELOPE_XSIZE	1
 #define MIN_ENVELOPE_YSIZE	1
@@ -1730,10 +1737,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
@@ -1855,6 +1863,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		: \
@@ -1866,7 +1875,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
@@ -1880,12 +1889,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
@@ -2087,7 +2097,8 @@ struct MenuInfo
 
   struct TitleFadingInfo enter_menu;
   struct TitleFadingInfo leave_menu;
-  struct TitleFadingInfo start_item;
+  struct TitleFadingInfo enter_screen[NUM_SPECIAL_GFX_ARGS];
+  struct TitleFadingInfo leave_screen[NUM_SPECIAL_GFX_ARGS];
 
   int sound[NUM_SPECIAL_GFX_ARGS];
   int music[NUM_SPECIAL_GFX_ARGS];
@@ -2660,6 +2671,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;