X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=1d771ed6589518a2ed7e2bbd517a1ad81e505b43;hb=caf3da0a0e3af75eb8d10f83e5105581402b387e;hp=4275ba7e8785de52ab07eaa4e401605349e63a40;hpb=6435b79b71c4033de78ab3e611ee63f6a2147874;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 4275ba7e..1d771ed6 100644
--- a/src/main.h
+++ b/src/main.h
@@ -60,91 +60,189 @@
 #define IN_SCR_FIELD(x,y) ((x)>=BX1 && (x)<=BX2 && (y)>=BY1 &&(y)<=BY2)
 #define IN_LEV_FIELD(x,y) ((x)>=0 && (x)<lev_fieldx && (y)>=0 &&(y)<lev_fieldy)
 
-/* values for 'Properties1' */
-#define EP_BIT_AMOEBALIVE	(1 << 0)
-#define EP_BIT_AMOEBOID		(1 << 1)
-#define EP_BIT_SCHLUESSEL	(1 << 2)
-#define EP_BIT_PFORTE		(1 << 3)
-#define EP_BIT_SOLID		(1 << 4)
-#define EP_BIT_INDESTRUCTIBLE	(1 << 5)
-#define EP_BIT_SLIPPERY		(1 << 6)
-#define EP_BIT_ENEMY		(1 << 7)
-#define EP_BIT_MAUER		(1 << 8)
-#define EP_BIT_CAN_FALL		(1 << 9)
-#define EP_BIT_CAN_SMASH	(1 << 10)
-#define EP_BIT_CAN_CHANGE	(1 << 11)
-#define EP_BIT_CAN_MOVE		(1 << 12)
-#define EP_BIT_COULD_MOVE	(1 << 13)
-#define EP_BIT_DONT_TOUCH	(1 << 14)
-#define EP_BIT_DONT_GO_TO	(1 << 15)
-#define EP_BIT_MAMPF2		(1 << 16)
-#define EP_BIT_CHAR		(1 << 17)
-#define EP_BIT_BD_ELEMENT	(1 << 18)
-#define EP_BIT_SB_ELEMENT	(1 << 19)
-#define EP_BIT_GEM		(1 << 20)
-#define EP_BIT_INACTIVE		(1 << 21)
-#define EP_BIT_EXPLOSIVE	(1 << 22)
-#define EP_BIT_MAMPF3		(1 << 23)
-#define EP_BIT_PUSHABLE		(1 << 24)
-#define EP_BIT_PLAYER		(1 << 25)
-#define EP_BIT_HAS_CONTENT	(1 << 26)
-#define EP_BIT_EATABLE		(1 << 27)
-#define EP_BIT_SP_ELEMENT	(1 << 28)
-#define EP_BIT_QUICK_GATE	(1 << 29)
-#define EP_BIT_OVER_PLAYER	(1 << 30)
-#define EP_BIT_ACTIVE_BOMB	(1 << 31)
-
-/* values for 'Properties2' */
-#define EP_BIT_BELT		(1 << 0)
-#define EP_BIT_BELT_ACTIVE	(1 << 1)
-#define EP_BIT_BELT_SWITCH	(1 << 2)
-#define EP_BIT_TUBE		(1 << 3)
-#define EP_BIT_EM_SLIPPERY_WALL	(1 << 4)
+/* values for configurable properties (custom elem's only, else pre-defined) */
+#define EP_DIGGABLE		0
+#define EP_COLLECTIBLE		1
+#define EP_UNUSED_2		2
+#define EP_UNUSED_3		3
+#define EP_UNUSED_4		4
+#define EP_INDESTRUCTIBLE	5
+#define EP_SLIPPERY		6
+#define EP_CAN_EXPLODE		7
+#define EP_CAN_MOVE		8
+#define EP_CAN_FALL		9
+#define EP_CAN_SMASH		10
+#define EP_WALKABLE_OVER	11
+#define EP_WALKABLE_INSIDE	12
+#define EP_WALKABLE_UNDER	13
+#define EP_PASSABLE_OVER	14
+#define EP_PASSABLE_INSIDE	15
+#define EP_PASSABLE_UNDER	16
+#define EP_CHANGEABLE		17
+#define EP_UNUSED_18		18
+#define EP_UNUSED_19		19
+#define EP_UNUSED_20		20
+#define EP_UNUSED_21		21
+#define EP_UNUSED_22		22
+#define EP_UNUSED_23		23
+#define EP_PUSHABLE		24
+
+/* values for special configurable properties (depending on level settings) */
+#define EP_EM_SLIPPERY_WALL	25
+
+/* values for special graphics properties (no effect on game engine) */
+#define EP_CAN_BE_CRUMBLED	26
+
+/* values for pre-defined properties */
+#define EP_PLAYER		27
+#define EP_CAN_PASS_MAGIC_WALL	28
+#define EP_SWITCHABLE		29
+#define EP_DONT_TOUCH		30
+#define EP_ENEMY		31
+#define EP_DONT_GO_TO		32
+#define EP_BD_ELEMENT		33
+#define EP_SP_ELEMENT		34
+#define EP_SB_ELEMENT		35
+#define EP_GEM			36
+#define EP_FOOD_DARK_YAMYAM	37
+#define EP_FOOD_PENGUIN		38
+#define EP_FOOD_PIG		39
+#define EP_HISTORIC_WALL	40
+#define EP_HISTORIC_SOLID	41
+#define EP_BELT			42
+#define EP_BELT_ACTIVE		43
+#define EP_BELT_SWITCH		44
+#define EP_TUBE			45
+#define EP_KEYGATE		46
+#define EP_AMOEBOID		47
+#define EP_AMOEBALIVE		48
+#define EP_HAS_CONTENT		49
+#define EP_ACTIVE_BOMB		50
+#define EP_INACTIVE		51
+
+/* values for derived properties (determined from properties above) */
+#define EP_ACCESSIBLE_OVER	52
+#define EP_ACCESSIBLE_INSIDE	53
+#define EP_ACCESSIBLE_UNDER	54
+#define EP_WALKABLE		55
+#define EP_PASSABLE		56
+#define EP_ACCESSIBLE		57
+#define EP_SNAPPABLE		58
+#define EP_WALL			59
+#define EP_SOLID_FOR_PUSHING	60
+#define EP_DRAGONFIRE_PROOF	61
+#define EP_EXPLOSION_PROOF	62
+
+/* values for internal purpose only (level editor) */
+#define EP_WALK_TO_OBJECT	63
+
+#define NUM_ELEMENT_PROPERTIES	64
+
+#define NUM_EP_BITFIELDS	((NUM_ELEMENT_PROPERTIES + 31) / 32)
+#define EP_BITFIELD_BASE	0
 
 #define EP_BITMASK_DEFAULT	0
 
-#define IS_AMOEBALIVE(e)	(Properties1[e] & EP_BIT_AMOEBALIVE)
-#define IS_AMOEBOID(e)		(Properties1[e] & EP_BIT_AMOEBOID)
-#define IS_SCHLUESSEL(e)	(Properties1[e] & EP_BIT_SCHLUESSEL)
-#define IS_PFORTE(e)		(Properties1[e] & EP_BIT_PFORTE)
-#define IS_SOLID(e)		(Properties1[e] & EP_BIT_SOLID)
-#define IS_INDESTRUCTIBLE(e)	(Properties1[e] & EP_BIT_INDESTRUCTIBLE)
-#define IS_SLIPPERY(e)		(Properties1[e] & EP_BIT_SLIPPERY)
-#define IS_ENEMY(e)		(Properties1[e] & EP_BIT_ENEMY)
-#define IS_MAUER(e)		(Properties1[e] & EP_BIT_MAUER)
-#define CAN_FALL(e)		(Properties1[e] & EP_BIT_CAN_FALL)
-#define CAN_SMASH(e)		(Properties1[e] & EP_BIT_CAN_SMASH)
-#define CAN_CHANGE(e)		(Properties1[e] & EP_BIT_CAN_CHANGE)
-#define CAN_MOVE(e)		(Properties1[e] & EP_BIT_CAN_MOVE)
-#define COULD_MOVE(e)		(Properties1[e] & EP_BIT_COULD_MOVE)
-#define DONT_TOUCH(e)		(Properties1[e] & EP_BIT_DONT_TOUCH)
-#define DONT_GO_TO(e)		(Properties1[e] & EP_BIT_DONT_GO_TO)
-#define IS_MAMPF2(e)		(Properties1[e] & EP_BIT_MAMPF2)
-#define IS_CHAR(e)		(Properties1[e] & EP_BIT_CHAR)
-#define IS_BD_ELEMENT(e)	(Properties1[e] & EP_BIT_BD_ELEMENT)
-#define IS_SB_ELEMENT(e)	(Properties1[e] & EP_BIT_SB_ELEMENT)
-#define IS_GEM(e)		(Properties1[e] & EP_BIT_GEM)
-#define IS_INACTIVE(e)		(Properties1[e] & EP_BIT_INACTIVE)
-#define IS_EXPLOSIVE(e)		(Properties1[e] & EP_BIT_EXPLOSIVE)
-#define IS_MAMPF3(e)		(Properties1[e] & EP_BIT_MAMPF3)
-#define IS_PUSHABLE(e)		(Properties1[e] & EP_BIT_PUSHABLE)
-#define ELEM_IS_PLAYER(e)	(Properties1[e] & EP_BIT_PLAYER)
-#define HAS_CONTENT(e)		(Properties1[e] & EP_BIT_HAS_CONTENT)
-#define IS_EATABLE(e)		(Properties1[e] & EP_BIT_EATABLE)
-#define IS_SP_ELEMENT(e)	(Properties1[e] & EP_BIT_SP_ELEMENT)
-#define IS_QUICK_GATE(e)	(Properties1[e] & EP_BIT_QUICK_GATE)
-#define IS_OVER_PLAYER(e)	(Properties1[e] & EP_BIT_OVER_PLAYER)
-#define IS_ACTIVE_BOMB(e)	(Properties1[e] & EP_BIT_ACTIVE_BOMB)
-
-#define IS_BELT(e)		(Properties2[e] & EP_BIT_BELT)
-#define IS_BELT_ACTIVE(e)	(Properties2[e] & EP_BIT_BELT_ACTIVE)
-#define IS_BELT_SWITCH(e)	(Properties2[e] & EP_BIT_BELT_SWITCH)
-#define IS_TUBE(e)		(Properties2[e] & EP_BIT_TUBE)
-#define IS_EM_SLIPPERY_WALL(e)	(Properties2[e] & EP_BIT_EM_SLIPPERY_WALL)
+#define PROPERTY_BIT(p)		(1 << ((p) % 32))
+#define PROPERTY_VAR(e,p)	(Properties[e][(p) / 32])
+#define HAS_PROPERTY(e,p)	((PROPERTY_VAR(e, p) & PROPERTY_BIT(p)) != 0)
+#define SET_PROPERTY(e,p,v)	((v) ?					   \
+				 (PROPERTY_VAR(e,p) |=  PROPERTY_BIT(p)) : \
+				 (PROPERTY_VAR(e,p) &= ~PROPERTY_BIT(p)))
+
+
+/* values for change events for custom elements */
+#define CE_DELAY_FIXED		0
+#define CE_DELAY_RANDOM		1
+
+#define NUM_CHANGE_EVENTS	2
+
+#define CE_BITMASK_DEFAULT	0
+
+#define CUSTOM_ELEMENT_INFO(e)	(level.custom_element[(e) - EL_CUSTOM_START])
+
+#define CH_EVENT_BIT(c)		(1 << (c))
+#define CH_EVENT_VAR(e)		(CUSTOM_ELEMENT_INFO(e).change.events)
+
+#define HAS_CHANGE_EVENT(e,c)	(IS_CUSTOM_ELEMENT(e) &&		  \
+				 (CH_EVENT_VAR(e) & CH_EVENT_BIT(c)) != 0)
+#define SET_CHANGE_EVENT(e,c,v)	(IS_CUSTOM_ELEMENT(e) ?			  \
+				 ((v) ?					  \
+				  (CH_EVENT_VAR(e) |=  CH_EVENT_BIT(c)) : \
+				  (CH_EVENT_VAR(e) &= ~CH_EVENT_BIT(c))) : 0)
+
+
+/* macros for configurable properties */
+#define IS_DIGGABLE(e)		HAS_PROPERTY(e, EP_DIGGABLE)
+#define IS_COLLECTIBLE(e)	HAS_PROPERTY(e, EP_COLLECTIBLE)
+#define IS_INDESTRUCTIBLE(e)	HAS_PROPERTY(e, EP_INDESTRUCTIBLE)
+#define IS_SLIPPERY(e)		HAS_PROPERTY(e, EP_SLIPPERY)
+#define CAN_EXPLODE(e)		HAS_PROPERTY(e, EP_CAN_EXPLODE)
+#define CAN_MOVE(e)		HAS_PROPERTY(e, EP_CAN_MOVE)
+#define CAN_FALL(e)		HAS_PROPERTY(e, EP_CAN_FALL)
+#define CAN_SMASH(e)		HAS_PROPERTY(e, EP_CAN_SMASH)
+#define IS_WALKABLE_OVER(e)	HAS_PROPERTY(e, EP_WALKABLE_OVER)
+#define IS_WALKABLE_INSIDE(e)	HAS_PROPERTY(e, EP_WALKABLE_INSIDE)
+#define IS_WALKABLE_UNDER(e)	HAS_PROPERTY(e, EP_WALKABLE_UNDER)
+#define IS_PASSABLE_OVER(e)	HAS_PROPERTY(e, EP_PASSABLE_OVER)
+#define IS_PASSABLE_INSIDE(e)	HAS_PROPERTY(e, EP_PASSABLE_INSIDE)
+#define IS_PASSABLE_UNDER(e)	HAS_PROPERTY(e, EP_PASSABLE_UNDER)
+#define IS_PUSHABLE(e)		HAS_PROPERTY(e, EP_PUSHABLE)
+#define IS_CHANGEABLE(e)	HAS_PROPERTY(e, EP_CHANGEABLE)
+
+/* macros for special configurable properties */
+#define IS_EM_SLIPPERY_WALL(e)	HAS_PROPERTY(e, EP_EM_SLIPPERY_WALL)
+
+/* macros for special graphics properties */
+#define CAN_BE_CRUMBLED(e)	HAS_PROPERTY(GFX_ELEMENT(e),EP_CAN_BE_CRUMBLED)
+
+/* macros for pre-defined properties */
+#define ELEM_IS_PLAYER(e)	HAS_PROPERTY(e, EP_PLAYER)
+#define CAN_PASS_MAGIC_WALL(e)	HAS_PROPERTY(e, EP_CAN_PASS_MAGIC_WALL)
+#define IS_SWITCHABLE(e)	HAS_PROPERTY(e, EP_SWITCHABLE)
+#define DONT_TOUCH(e)		HAS_PROPERTY(e, EP_DONT_TOUCH)
+#define IS_ENEMY(e)		HAS_PROPERTY(e, EP_ENEMY)
+#define DONT_GO_TO(e)		HAS_PROPERTY(e, EP_DONT_GO_TO)
+#define IS_BD_ELEMENT(e)	HAS_PROPERTY(e, EP_BD_ELEMENT)
+#define IS_SP_ELEMENT(e)	HAS_PROPERTY(e, EP_SP_ELEMENT)
+#define IS_SB_ELEMENT(e)	HAS_PROPERTY(e, EP_SB_ELEMENT)
+#define IS_GEM(e)		HAS_PROPERTY(e, EP_GEM)
+#define IS_FOOD_DARK_YAMYAM(e)	HAS_PROPERTY(e, EP_FOOD_DARK_YAMYAM)
+#define IS_FOOD_PENGUIN(e)	HAS_PROPERTY(e, EP_FOOD_PENGUIN)
+#define IS_FOOD_PIG(e)		HAS_PROPERTY(e, EP_FOOD_PIG)
+#define IS_HISTORIC_WALL(e)	HAS_PROPERTY(e, EP_HISTORIC_WALL)
+#define IS_HISTORIC_SOLID(e)	HAS_PROPERTY(e, EP_HISTORIC_SOLID)
+#define IS_BELT(e)		HAS_PROPERTY(e, EP_BELT)
+#define IS_BELT_ACTIVE(e)	HAS_PROPERTY(e, EP_BELT_ACTIVE)
+#define IS_BELT_SWITCH(e)	HAS_PROPERTY(e, EP_BELT_SWITCH)
+#define IS_TUBE(e)		HAS_PROPERTY(e, EP_TUBE)
+#define IS_KEYGATE(e)		HAS_PROPERTY(e, EP_KEYGATE)
+#define IS_AMOEBOID(e)		HAS_PROPERTY(e, EP_AMOEBOID)
+#define IS_AMOEBALIVE(e)	HAS_PROPERTY(e, EP_AMOEBALIVE)
+#define HAS_CONTENT(e)		HAS_PROPERTY(e, EP_HAS_CONTENT)
+#define IS_ACTIVE_BOMB(e)	HAS_PROPERTY(e, EP_ACTIVE_BOMB)
+#define IS_INACTIVE(e)		HAS_PROPERTY(e, EP_INACTIVE)
+
+/* macros for derived properties */
+#define IS_ACCESSIBLE_OVER(e)	HAS_PROPERTY(e, EP_ACCESSIBLE_OVER)
+#define IS_ACCESSIBLE_INSIDE(e)	HAS_PROPERTY(e, EP_ACCESSIBLE_INSIDE)
+#define IS_ACCESSIBLE_UNDER(e)	HAS_PROPERTY(e, EP_ACCESSIBLE_UNDER)
+#define IS_SNAPPABLE(e)		HAS_PROPERTY(e, EP_SNAPPABLE)
+#define IS_WALKABLE(e)		HAS_PROPERTY(e, EP_WALKABLE)
+#define IS_PASSABLE(e)		HAS_PROPERTY(e, EP_PASSABLE)
+#define IS_ACCESSIBLE(e)	HAS_PROPERTY(e, EP_ACCESSIBLE)
+#define IS_WALL(e)		HAS_PROPERTY(e, EP_WALL)
+#define IS_SOLID_FOR_PUSHING(e)	HAS_PROPERTY(e, EP_SOLID_FOR_PUSHING)
+#define IS_DRAGONFIRE_PROOF(e)	HAS_PROPERTY(e, EP_DRAGONFIRE_PROOF)
+#define IS_EXPLOSION_PROOF(e)	HAS_PROPERTY(e, EP_EXPLOSION_PROOF)
 
 #define IS_CUSTOM_ELEMENT(e)	((e) >= EL_CUSTOM_START &&	\
 	 			 (e) <= EL_CUSTOM_END)
 
+#define GFX_ELEMENT(e)		(IS_CUSTOM_ELEMENT(e) &&		  \
+				 CUSTOM_ELEMENT_INFO(e).use_gfx_element ? \
+				 CUSTOM_ELEMENT_INFO(e).gfx_element : e)
+
 #define IS_PLAYER(x,y)		(ELEM_IS_PLAYER(StorePlayer[x][y]))
 
 #define IS_FREE(x,y)		(Feld[x][y] == EL_EMPTY && !IS_PLAYER(x,y))
@@ -171,7 +269,8 @@
 
 #define PLAYERINFO(x,y)		(&stored_player[StorePlayer[x][y]-EL_PLAYER_1])
 #define SHIELD_ON(p)		((p)->shield_normal_time_left > 0)
-#define PROTECTED_FIELD(x,y)	(IS_TUBE(Feld[x][y]))
+#define PROTECTED_FIELD(x,y)	(IS_ACCESSIBLE_INSIDE(Feld[x][y]) &&	\
+				 IS_INDESTRUCTIBLE(Feld[x][y]))
 #define PLAYER_PROTECTED(x,y)	(SHIELD_ON(PLAYERINFO(x, y)) ||		\
 				 PROTECTED_FIELD(x, y))
 
@@ -189,56 +288,11 @@
 #define IS_LOOP_SOUND(s)	(sound_info[s].loop)
 
 
-#if 0
-
-/* Bitmaps with graphic file */
-#define PIX_BACK		0
-#define PIX_DOOR		1
-#define PIX_TOONS		2
-#define PIX_FONT_BIG		3
-#define PIX_FONT_SMALL		4
-#define PIX_FONT_MEDIUM		5
-#define PIX_FONT_EM		6
-/* Bitmaps without graphic file */
-#define PIX_DB_DOOR		7
-#define PIX_DB_FIELD		8
-
-#define NUM_PICTURES		7
-#define NUM_BITMAPS		9
-
-#else
-
-/* Bitmaps with graphic file */
-#define PIX_BACK		0
-#define PIX_ELEMENTS		1
-#define PIX_DOOR		2
-#define PIX_HEROES		3
-#define PIX_TOONS		4
-#define PIX_SP			5
-#define PIX_DC			6
-#define PIX_MORE		7
-#define PIX_FONT_BIG		8
-#define PIX_FONT_SMALL		9
-#define PIX_FONT_MEDIUM		10
-#define PIX_FONT_EM		11
-/* Bitmaps without graphic file */
-#define PIX_DB_DOOR		12
-#define PIX_DB_FIELD		13
-
-#define NUM_PICTURES		12
-#define NUM_BITMAPS		14
-
-#endif
-
 /* boundaries of arrays etc. */
 #define MAX_LEVEL_NAME_LEN	32
 #define MAX_LEVEL_AUTHOR_LEN	32
 #define MAX_TAPELEN		(1000 * 50)	/* max. time * framerate */
 #define MAX_SCORE_ENTRIES	100
-#if 0
-#define MAX_ELEMENTS		700		/* 500 static + 200 runtime */
-#define MAX_GRAPHICS		1536		/* see below: NUM_TILES */
-#endif
 #define MAX_NUM_AMOEBA		100
 
 /* values for elements with content */
@@ -438,15 +492,7 @@
 #define EL_CHAR_ASCII0_END		(EL_CHAR_ASCII0 + 111)
 #define EL_CHAR_END			(EL_CHAR_START  + 79)
 
-#define EL_CHAR(x)			((x) == 'Ä' ? EL_CHAR_AE         : \
-					 (x) == 'Ö' ? EL_CHAR_OE         : \
-					 (x) == 'Ü' ? EL_CHAR_UE         : \
-					 (x) == '^' ? EL_CHAR_COPYRIGHT  : \
-					 (x) == '_' ? EL_CHAR_UNDERSCORE : \
-					 (x) == '°' ? EL_CHAR_DEGREE     : \
-					 (x) == '´' ? EL_CHAR_TM         : \
-					 (x) == '|' ? EL_CHAR_CURSOR     : \
-					 EL_CHAR_A + (x) - 'A')
+#define EL_CHAR(c)			(EL_CHAR_ASCII0 + MAP_FONT_ASCII(c))
 
 #define EL_EXPANDABLE_WALL_HORIZONTAL	200
 #define EL_EXPANDABLE_WALL_VERTICAL	201
@@ -756,7 +802,7 @@
 
 #define NUM_ACTIONS				26
 
-/* values for special image configuration suffixes */
+/* values for special image configuration suffixes (must match game mode) */
 #define GFX_SPECIAL_ARG_MAIN			0
 #define GFX_SPECIAL_ARG_LEVELS			1
 #define GFX_SPECIAL_ARG_SCORES			2
@@ -792,10 +838,9 @@
 #define GFX_ARG_POSITION			19
 #define GFX_ARG_DRAW_XOFFSET			20
 #define GFX_ARG_DRAW_YOFFSET			21
-#define GFX_ARG_FORMAT				22
-#define GFX_ARG_NAME				23
+#define GFX_ARG_NAME				22
 
-#define NUM_GFX_ARGS				24
+#define NUM_GFX_ARGS				23
 
 
 /* values for sound configuration suffixes */
@@ -814,54 +859,69 @@
 #define FONT_TITLE_2				5
 #define FONT_MENU_1				6
 #define FONT_MENU_2				7
-#define FONT_TEXT_1				8
-#define FONT_TEXT_2				9
-#define FONT_TEXT_3				10
-#define FONT_TEXT_4				11
-#define FONT_INPUT				12
-#define FONT_INPUT_ACTIVE			13
-#define FONT_OPTION_OFF				14
-#define FONT_OPTION_ON				15
-#define FONT_VALUE_1				16
-#define FONT_VALUE_2				17
-#define FONT_VALUE_OLD				18
-#define FONT_TAPE_RECORDER			19
-#define FONT_LEVEL_NUMBER			20
-
-#define NUM_FONTS				21
+#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_INPUT_1_ACTIVE			16
+#define FONT_INPUT_2_ACTIVE			17
+#define FONT_INPUT_1				18
+#define FONT_INPUT_2				19
+#define FONT_OPTION_OFF				20
+#define FONT_OPTION_ON				21
+#define FONT_VALUE_1				22
+#define FONT_VALUE_2				23
+#define FONT_VALUE_OLD				24
+#define FONT_LEVEL_NUMBER			25
+#define FONT_TAPE_RECORDER			26
+#define FONT_GAME_INFO				27
+
+#define NUM_FONTS				28
 #define NUM_INITIAL_FONTS			4
 
-
-/* values for game_status */
-#define EXITGAME		0
-#define MAINMENU		1
-#define PLAYING			2
-#define LEVELED			3
-#define HELPSCREEN		4
-#define CHOOSELEVEL		5
-#define TYPENAME		6
-#define HALLOFFAME		7
-#define SETUP			8
-#define PSEUDO_PREVIEW		9
-#define PSEUDO_DOOR		10
+/* values for game_status (must match special image configuration suffixes) */
+#define GAME_MODE_MAIN				0
+#define GAME_MODE_LEVELS			1
+#define GAME_MODE_SCORES			2
+#define GAME_MODE_EDITOR			3
+#define GAME_MODE_INFO				4
+#define GAME_MODE_SETUP				5
+#define GAME_MODE_PSEUDO_DOOR			6
+#define GAME_MODE_PSEUDO_PREVIEW		7
+
+/* there are no special config file suffixes for these modes */
+#define GAME_MODE_PLAYING			8
+#define GAME_MODE_PSEUDO_TYPENAME		9
+#define GAME_MODE_QUIT				10
 
 #define PROGRAM_VERSION_MAJOR	2
 #define PROGRAM_VERSION_MINOR	2
 #define PROGRAM_VERSION_PATCH	0
-#define PROGRAM_VERSION_STRING	"2.2.0rc4"
+#define PROGRAM_VERSION_STRING	"2.2.0rc7"
 
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
-#define PROGRAM_RIGHTS_STRING	"Copyright ^1995-2003 by"
+#define PROGRAM_RIGHTS_STRING	"Copyright ©1995-2003 by"
 #define PROGRAM_DOS_PORT_STRING	"DOS port done by Guido Schulz"
 #define PROGRAM_IDENT_STRING	PROGRAM_VERSION_STRING " " TARGET_STRING
 #define WINDOW_TITLE_STRING	PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING
 #define WINDOW_SUBTITLE_STRING	PROGRAM_RIGHTS_STRING " " PROGRAM_AUTHOR_STRING
 #define ICON_TITLE_STRING	PROGRAM_TITLE_STRING
-#define UNIX_USERDATA_DIRECTORY	".rocksndiamonds"
 #define COOKIE_PREFIX		"ROCKSNDIAMONDS"
 #define FILENAME_PREFIX		"Rocks"
 
+#if defined(PLATFORM_UNIX)
+#define USERDATA_DIRECTORY	".rocksndiamonds"
+#elif defined(PLATFORM_WIN32)
+#define USERDATA_DIRECTORY	PROGRAM_TITLE_STRING
+#else
+#define USERDATA_DIRECTORY	"userdata"
+#endif
+
 #define X11_ICON_FILENAME	"rocks_icon.xbm"
 #define X11_ICONMASK_FILENAME	"rocks_iconmask.xbm"
 #define MSDOS_POINTER_FILENAME	"mouse.pcx"
@@ -959,6 +1019,34 @@ struct PlayerInfo
   int shield_deadly_time_left;
 };
 
+struct CustomElementChangeInfo
+{
+  unsigned long events;		/* bitfield for change events */
+
+  int delay_fixed;		/* added frame delay before changed (fixed) */
+  int delay_random;		/* added frame delay before changed (random) */
+  int delay_frames;		/* either 1 (frames) or 50 (seconds; 50 fps) */
+
+  short successor;		/* new custom element after change */
+};
+
+struct CustomElementInfo
+{
+  boolean use_template;		/* use all properties from template file */
+
+  boolean use_gfx_element;
+  short gfx_element;		/* optional custom graphic element */
+
+  int move_direction;		/* direction movable element moves to */
+
+  int walk_to_action;		/* only for level editor; not stored */
+  int walkable_layer;		/* only for level editor; not stored */
+
+  int content[3][3];		/* new elements after explosion */
+
+  struct CustomElementChangeInfo change;
+};
+
 struct LevelInfo
 {
   int file_version;	/* file format version the level is stored with    */
@@ -975,8 +1063,8 @@ struct LevelInfo
   char name[MAX_LEVEL_NAME_LEN + 1];
   char author[MAX_LEVEL_AUTHOR_LEN + 1];
   int score[LEVEL_SCORE_ELEMENTS];
-  int yam_content[MAX_ELEMENT_CONTENTS][3][3];
-  int num_yam_contents;
+  int yamyam_content[MAX_ELEMENT_CONTENTS][3][3];
+  int num_yamyam_contents;
   int amoeba_speed;
   int amoeba_content;
   int time_magic_wall;
@@ -987,6 +1075,8 @@ struct LevelInfo
   boolean gravity;
   boolean em_slippery_gems;	/* EM style "gems slip from wall" behaviour */
 
+  struct CustomElementInfo custom_element[NUM_CUSTOM_ELEMENTS];
+
   boolean no_level_file;
 };
 
@@ -996,6 +1086,7 @@ struct TapeInfo
   int game_version;	/* game release version the tape was created with */
   int engine_version;	/* game engine version the tape was recorded with */
 
+  char *level_identifier;
   int level_nr;
   unsigned long random_seed;
   unsigned long date;
@@ -1031,7 +1122,7 @@ struct GameInfo
   int initial_move_delay_value;
 
   /* variable within running game */
-  int yam_content_nr;
+  int yamyam_content_nr;
   boolean magic_wall_active;
   int magic_wall_time_left;
   int light_time_left;
@@ -1050,19 +1141,25 @@ struct GlobalInfo
 
   int num_toons;
 
-  int menu_draw_xoffset;
-  int menu_draw_yoffset;
-  int menu_draw_xoffset_MAIN;
-  int menu_draw_yoffset_MAIN;
-
-  int door_step_offset;
-  int door_step_delay;
-
   float frames_per_second;
   boolean fps_slowdown;
   int fps_slowdown_factor;
 };
 
+struct MenuInfo
+{
+  int draw_xoffset_default;
+  int draw_yoffset_default;
+  int draw_xoffset[NUM_SPECIAL_GFX_ARGS];
+  int draw_yoffset[NUM_SPECIAL_GFX_ARGS];
+};
+
+struct DoorInfo
+{
+  int step_offset;
+  int step_delay;
+};
+
 struct ElementInfo
 {
   char *token_name;		/* element token used in config files */
@@ -1097,6 +1194,7 @@ struct GraphicInfo
   int width, height;		/* width/height of each animation frame */
   int offset_x, offset_y;	/* x/y offset to next animation frame */
   int anim_frames;
+  int anim_frames_per_line;
   int anim_start_frame;
   int anim_delay;		/* important: delay of 1 means "no delay"! */
   int anim_mode;
@@ -1164,6 +1262,7 @@ extern short			MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short			Back[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern boolean			Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -1172,8 +1271,7 @@ extern short			AmoebaCnt2[MAX_NUM_AMOEBA];
 extern short			ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
-extern unsigned long		Properties1[MAX_NUM_ELEMENTS];
-extern unsigned long		Properties2[MAX_NUM_ELEMENTS];
+extern unsigned long		Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS];
 
 extern int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -1211,10 +1309,13 @@ extern struct HiScore		highscore[];
 extern struct TapeInfo		tape;
 extern struct GameInfo		game;
 extern struct GlobalInfo	global;
+extern struct MenuInfo		menu;
+extern struct DoorInfo		door;
 extern struct ElementInfo	element_info[];
 extern struct ElementActionInfo	element_action_info[];
 extern struct ElementDirectionInfo element_direction_info[];
 extern struct SpecialSuffixInfo special_suffix_info[];
+extern struct TokenIntPtrInfo	image_config_vars[];
 extern struct FontInfo		font_info[];
 extern struct GraphicInfo      *graphic_info;
 extern struct SoundInfo	       *sound_info;