X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=2833e094cfacf96086e69d8ae92a6e7223c1bb82;hb=ac4c028b525860750de315d626730ac493f56944;hp=22807c17e54d12acdba6a6d434348b0ba02f3d08;hpb=2314567d307a17f1405990a88e98a4a12cad429f;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 22807c17..2833e094 100644
--- a/src/main.h
+++ b/src/main.h
@@ -64,7 +64,7 @@
 #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
@@ -129,7 +129,7 @@
 #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)
@@ -368,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
@@ -479,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
@@ -532,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
@@ -712,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)