X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=2833e094cfacf96086e69d8ae92a6e7223c1bb82;hb=ac4c028b525860750de315d626730ac493f56944;hp=6e46f348e52bb8a531acd74c74bd45484554a0c4;hpb=5ae04ac2ef54f6f164a797c16c9782042cc2ce67;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 6e46f348..2833e094 100644
--- a/src/main.h
+++ b/src/main.h
@@ -60,11 +60,11 @@
 #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)
 
-/* property values */
+/* values for base properties (storable) */
 #define EP_AMOEBALIVE		0
 #define EP_AMOEBOID		1
 #define EP_CAN_BE_CRUMBLED	2
-#define EP_PFORTE		3
+
 #define EP_SOLID		4
 #define EP_INDESTRUCTIBLE	5
 #define EP_SLIPPERY		6
@@ -88,25 +88,36 @@
 #define EP_PUSHABLE		24
 #define EP_PLAYER		25
 #define EP_WALKABLE_OVER	26
-#define EP_DIGGABLE		27
-#define EP_COLLECTIBLE		28
-#define EP_WALKABLE_THROUGH	29
-#define EP_OVER_PLAYER		30
-#define EP_ACTIVE_BOMB		31
-
-#define EP_BELT			32
-#define EP_BELT_ACTIVE		33
-#define EP_BELT_SWITCH		34
-#define EP_WALKABLE_UNDER	35
-#define EP_SP_ELEMENT		36
-#define EP_HAS_CONTENT		37
-#define EP_SOLID_NEW		38
-
-#define NUM_ELEMENT_PROPERTIES	39
+#define EP_WALKABLE_INSIDE	27
+#define EP_WALKABLE_UNDER	28
+#define EP_PASSABLE_OVER	29
+#define EP_PASSABLE_INSIDE	30
+#define EP_PASSABLE_UNDER	31
+
+/* values for runtime properties (non-storable) */
+#define EP_ACCESSIBLE_OVER	32
+#define EP_ACCESSIBLE_INSIDE	33
+#define EP_ACCESSIBLE_UNDER	34
+#define EP_WALKABLE		35
+#define EP_PASSABLE		36
+#define EP_ACCESSIBLE		37
+#define EP_DIGGABLE		38
+#define EP_COLLECTIBLE		39
+#define EP_ACTIVE_BOMB		40
+#define EP_BELT			41
+#define EP_BELT_ACTIVE		42
+#define EP_BELT_SWITCH		43
+#define EP_SP_ELEMENT		44
+#define EP_HAS_CONTENT		45
+#define EP_TUBE			46
+
+#define NUM_ELEMENT_PROPERTIES	47
 
 #define NUM_EP_BITFIELDS	((NUM_ELEMENT_PROPERTIES + 31) / 32)
 #define EP_BITFIELD_BASE	0
 
+#define EP_BITMASK_DEFAULT	0
+
 #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)
@@ -114,56 +125,11 @@
 				 (PROPERTY_VAR(e,p) |=  PROPERTY_BIT(p)) : \
 				 (PROPERTY_VAR(e,p) &= ~PROPERTY_BIT(p)))
 
-/* property bit masks */
-#define EP_BIT_AMOEBALIVE	PROPERTY_BIT(EP_AMOEBALIVE)
-#define EP_BIT_AMOEBOID		PROPERTY_BIT(EP_AMOEBOID)
-#define EP_BIT_CAN_BE_CRUMBLED	PROPERTY_BIT(EP_CAN_BE_CRUMBLED)
-#define EP_BIT_PFORTE		PROPERTY_BIT(EP_PFORTE)
-#define EP_BIT_SOLID		PROPERTY_BIT(EP_SOLID)
-#define EP_BIT_INDESTRUCTIBLE	PROPERTY_BIT(EP_INDESTRUCTIBLE)
-#define EP_BIT_SLIPPERY		PROPERTY_BIT(EP_SLIPPERY)
-#define EP_BIT_ENEMY		PROPERTY_BIT(EP_ENEMY)
-#define EP_BIT_MAUER		PROPERTY_BIT(EP_MAUER)
-#define EP_BIT_CAN_FALL		PROPERTY_BIT(EP_CAN_FALL)
-#define EP_BIT_CAN_SMASH	PROPERTY_BIT(EP_CAN_SMASH)
-#define EP_BIT_CAN_CHANGE	PROPERTY_BIT(EP_CAN_CHANGE)
-#define EP_BIT_CAN_MOVE		PROPERTY_BIT(EP_CAN_MOVE)
-#define EP_BIT_COULD_MOVE	PROPERTY_BIT(EP_COULD_MOVE)
-#define EP_BIT_DONT_TOUCH	PROPERTY_BIT(EP_DONT_TOUCH)
-#define EP_BIT_DONT_GO_TO	PROPERTY_BIT(EP_DONT_GO_TO)
-#define EP_BIT_FOOD_DARK_YAMYAM	PROPERTY_BIT(EP_FOOD_DARK_YAMYAM)
-#define EP_BIT_EM_SLIPPERY_WALL	PROPERTY_BIT(EP_EM_SLIPPERY_WALL)
-#define EP_BIT_BD_ELEMENT	PROPERTY_BIT(EP_BD_ELEMENT)
-#define EP_BIT_SB_ELEMENT	PROPERTY_BIT(EP_SB_ELEMENT)
-#define EP_BIT_GEM		PROPERTY_BIT(EP_GEM)
-#define EP_BIT_INACTIVE		PROPERTY_BIT(EP_INACTIVE)
-#define EP_BIT_EXPLOSIVE	PROPERTY_BIT(EP_EXPLOSIVE)
-#define EP_BIT_FOOD_PENGUIN	PROPERTY_BIT(EP_FOOD_PENGUIN)
-#define EP_BIT_PUSHABLE		PROPERTY_BIT(EP_PUSHABLE)
-#define EP_BIT_PLAYER		PROPERTY_BIT(EP_PLAYER)
-#define EP_BIT_WALKABLE_OVER	PROPERTY_BIT(EP_WALKABLE_OVER)
-#define EP_BIT_DIGGABLE		PROPERTY_BIT(EP_DIGGABLE)
-#define EP_BIT_COLLECTIBLE	PROPERTY_BIT(EP_COLLECTIBLE)
-#define EP_BIT_WALKABLE_THROUGH PROPERTY_BIT(EP_WALKABLE_THROUGH)
-#define EP_BIT_OVER_PLAYER	PROPERTY_BIT(EP_OVER_PLAYER)
-#define EP_BIT_ACTIVE_BOMB	PROPERTY_BIT(EP_ACTIVE_BOMB)
-
-#define EP_BIT_BELT		PROPERTY_BIT(EP_BELT)
-#define EP_BIT_BELT_ACTIVE	PROPERTY_BIT(EP_BELT_ACTIVE)
-#define EP_BIT_BELT_SWITCH	PROPERTY_BIT(EP_BELT_SWITCH)
-#define EP_BIT_WALKABLE_UNDER	PROPERTY_BIT(EP_WALKABLE_UNDER)
-#define EP_BIT_SP_ELEMENT	PROPERTY_BIT(EP_SP_ELEMENT)
-#define EP_BIT_HAS_CONTENT	PROPERTY_BIT(EP_HAS_CONTENT)
-#define EP_BIT_SOLID_NEW	PROPERTY_BIT(EP_SOLID_NEW)
-
-
-#define EP_BITMASK_DEFAULT	0
-
-/* property macros */
+/* macros for base properties */
 #define IS_AMOEBALIVE(e)	HAS_PROPERTY(e, EP_AMOEBALIVE)
 #define IS_AMOEBOID(e)		HAS_PROPERTY(e, EP_AMOEBOID)
 #define CAN_BE_CRUMBLED(e)	HAS_PROPERTY(e, EP_CAN_BE_CRUMBLED)
-#define IS_PFORTE(e)		HAS_PROPERTY(e, EP_PFORTE)
+
 #define IS_SOLID(e)		HAS_PROPERTY(e, EP_SOLID)
 #define IS_INDESTRUCTIBLE(e)	HAS_PROPERTY(e, EP_INDESTRUCTIBLE)
 #define IS_SLIPPERY(e)		HAS_PROPERTY(e, EP_SLIPPERY)
@@ -187,19 +153,28 @@
 #define IS_PUSHABLE(e)		HAS_PROPERTY(e, EP_PUSHABLE)
 #define ELEM_IS_PLAYER(e)	HAS_PROPERTY(e, EP_PLAYER)
 #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)
+
+/* macros for runtime 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_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_DIGGABLE(e)		HAS_PROPERTY(e, EP_DIGGABLE)
 #define IS_COLLECTIBLE(e)	HAS_PROPERTY(e, EP_COLLECTIBLE)
-#define IS_WALKABLE_THROUGH(e)	HAS_PROPERTY(e, EP_WALKABLE_THROUGH)
-#define IS_OVER_PLAYER(e)	HAS_PROPERTY(e, EP_OVER_PLAYER)
 #define IS_ACTIVE_BOMB(e)	HAS_PROPERTY(e, EP_ACTIVE_BOMB)
-
 #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_WALKABLE_UNDER(e)	HAS_PROPERTY(e, EP_WALKABLE_UNDER)
 #define IS_SP_ELEMENT(e)	HAS_PROPERTY(e, EP_SP_ELEMENT)
 #define HAS_CONTENT(e)		HAS_PROPERTY(e, EP_HAS_CONTENT)
-#define IS_SOLID_NEW(e)		HAS_PROPERTY(e, EP_SOLID_NEW)
+#define IS_TUBE(e)		HAS_PROPERTY(e, EP_TUBE)
 
 #define IS_CUSTOM_ELEMENT(e)	((e) >= EL_CUSTOM_START &&	\
 	 			 (e) <= EL_CUSTOM_END)
@@ -230,7 +205,7 @@
 
 #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_WALKABLE_UNDER(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))
@@ -393,14 +368,14 @@
 #define EL_KEY_2			33
 #define EL_KEY_3			34
 #define EL_KEY_4			35
-#define EL_GATE_1			36
-#define EL_GATE_2			37
-#define EL_GATE_3			38
-#define EL_GATE_4			39
-#define EL_GATE_1_GRAY			40
-#define EL_GATE_2_GRAY			41
-#define EL_GATE_3_GRAY			42
-#define EL_GATE_4_GRAY			43
+#define EL_GATE_1_CLOSED		36
+#define EL_GATE_2_CLOSED		37
+#define EL_GATE_3_CLOSED		38
+#define EL_GATE_4_CLOSED		39
+#define EL_GATE_1_GRAY_CLOSED		40
+#define EL_GATE_2_GRAY_CLOSED		41
+#define EL_GATE_3_GRAY_CLOSED		42
+#define EL_GATE_4_GRAY_CLOSED		43
 #define EL_DYNAMITE			44
 #define EL_PACMAN			45
 #define EL_INVISIBLE_WALL		46
@@ -504,10 +479,10 @@
 #define EL_EXPANDABLE_WALL_VERTICAL	201
 #define EL_EXPANDABLE_WALL_ANY		202
 
-#define EL_EM_GATE_1			203
-#define EL_EM_GATE_2			204
-#define EL_EM_GATE_3			205
-#define EL_EM_GATE_4			206
+#define EL_EM_GATE_1_CLOSED		203
+#define EL_EM_GATE_2_CLOSED		204
+#define EL_EM_GATE_3_CLOSED		205
+#define EL_EM_GATE_4_CLOSED		206
 
 #define EL_EM_KEY_2_FILE			207
 #define EL_EM_KEY_3_FILE			208
@@ -557,10 +532,10 @@
 #define EL_SP_CHIP_BOTTOM		(EL_SP_START + 39)
 #define EL_SP_END			(EL_SP_START + 39)
 
-#define EL_EM_GATE_1_GRAY		250
-#define EL_EM_GATE_2_GRAY		251
-#define EL_EM_GATE_3_GRAY		252
-#define EL_EM_GATE_4_GRAY		253
+#define EL_EM_GATE_1_GRAY_CLOSED	250
+#define EL_EM_GATE_2_GRAY_CLOSED	251
+#define EL_EM_GATE_3_GRAY_CLOSED	252
+#define EL_EM_GATE_4_GRAY_CLOSED	253
 
 #define EL_UNUSED_254			254
 #define EL_UNUSED_255			255
@@ -737,9 +712,25 @@
 #define EL_BD_MAGIC_WALL_EMPTYING	(EL_FIRST_RUNTIME_REAL + 43)
 #define EL_MAGIC_WALL_DEAD		(EL_FIRST_RUNTIME_REAL + 44)
 #define EL_BD_MAGIC_WALL_DEAD		(EL_FIRST_RUNTIME_REAL + 45)
+#define EL_GATE_1_OPEN			(EL_FIRST_RUNTIME_REAL + 46)
+#define EL_GATE_2_OPEN			(EL_FIRST_RUNTIME_REAL + 47)
+#define EL_GATE_3_OPEN			(EL_FIRST_RUNTIME_REAL + 48)
+#define EL_GATE_4_OPEN			(EL_FIRST_RUNTIME_REAL + 49)
+#define EL_GATE_1_GRAY_OPEN		(EL_FIRST_RUNTIME_REAL + 50)
+#define EL_GATE_2_GRAY_OPEN		(EL_FIRST_RUNTIME_REAL + 51)
+#define EL_GATE_3_GRAY_OPEN		(EL_FIRST_RUNTIME_REAL + 52)
+#define EL_GATE_4_GRAY_OPEN		(EL_FIRST_RUNTIME_REAL + 53)
+#define EL_EM_GATE_1_OPEN		(EL_FIRST_RUNTIME_REAL + 54)
+#define EL_EM_GATE_2_OPEN		(EL_FIRST_RUNTIME_REAL + 55)
+#define EL_EM_GATE_3_OPEN		(EL_FIRST_RUNTIME_REAL + 56)
+#define EL_EM_GATE_4_OPEN		(EL_FIRST_RUNTIME_REAL + 57)
+#define EL_EM_GATE_1_GRAY_OPEN		(EL_FIRST_RUNTIME_REAL + 58)
+#define EL_EM_GATE_2_GRAY_OPEN		(EL_FIRST_RUNTIME_REAL + 59)
+#define EL_EM_GATE_3_GRAY_OPEN		(EL_FIRST_RUNTIME_REAL + 60)
+#define EL_EM_GATE_4_GRAY_OPEN		(EL_FIRST_RUNTIME_REAL + 61)
 
 /* "unreal" (and therefore not drawable) runtime elements */
-#define EL_FIRST_RUNTIME_UNREAL		(EL_FIRST_RUNTIME_REAL + 46)
+#define EL_FIRST_RUNTIME_UNREAL		(EL_FIRST_RUNTIME_REAL + 62)
 
 #define EL_BLOCKED			(EL_FIRST_RUNTIME_UNREAL + 0)
 #define EL_EXPLOSION			(EL_FIRST_RUNTIME_UNREAL + 1)
@@ -901,7 +892,7 @@
 #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.0rc6"
 
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
@@ -1228,6 +1219,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];