X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=f4243bf685b651c43b517eb0281993528cf8275a;hb=c956237d7c5507aea649ce7b20c00d7bd9d37a7a;hp=6448eb4bed7a296376e6c3549f447d6222485936;hpb=72e44014938c9042261b67213a6cd37b7a17488f;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 6448eb4b..f4243bf6 100644
--- a/src/main.h
+++ b/src/main.h
@@ -64,12 +64,12 @@
 #define EP_AMOEBALIVE		0
 #define EP_AMOEBOID		1
 #define EP_CAN_BE_CRUMBLED	2
-#define EP_PFORTE		3
-#define EP_SOLID		4
+#define EP_KEYGATE		3
+#define EP_HISTORIC_SOLID	4
 #define EP_INDESTRUCTIBLE	5
 #define EP_SLIPPERY		6
 #define EP_ENEMY		7
-#define EP_MAUER		8
+#define EP_HISTORIC_WALL	8
 #define EP_CAN_FALL		9
 #define EP_CAN_SMASH		10
 #define EP_CAN_CHANGE		11
@@ -110,8 +110,9 @@
 #define EP_SP_ELEMENT		44
 #define EP_HAS_CONTENT		45
 #define EP_TUBE			46
+#define EP_WALL			47
 
-#define NUM_ELEMENT_PROPERTIES	47
+#define NUM_ELEMENT_PROPERTIES	48
 
 #define NUM_EP_BITFIELDS	((NUM_ELEMENT_PROPERTIES + 31) / 32)
 #define EP_BITFIELD_BASE	0
@@ -129,12 +130,12 @@
 #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_KEYGATE(e)		HAS_PROPERTY(e, EP_KEYGATE)
+#define IS_HISTORIC_SOLID(e)	HAS_PROPERTY(e, EP_HISTORIC_SOLID)
 #define IS_INDESTRUCTIBLE(e)	HAS_PROPERTY(e, EP_INDESTRUCTIBLE)
 #define IS_SLIPPERY(e)		HAS_PROPERTY(e, EP_SLIPPERY)
 #define IS_ENEMY(e)		HAS_PROPERTY(e, EP_ENEMY)
-#define IS_MAUER(e)		HAS_PROPERTY(e, EP_MAUER)
+#define IS_HISTORIC_WALL(e)	HAS_PROPERTY(e, EP_HISTORIC_WALL)
 #define CAN_FALL(e)		HAS_PROPERTY(e, EP_CAN_FALL)
 #define CAN_SMASH(e)		HAS_PROPERTY(e, EP_CAN_SMASH)
 #define CAN_CHANGE(e)		HAS_PROPERTY(e, EP_CAN_CHANGE)
@@ -175,6 +176,7 @@
 #define IS_SP_ELEMENT(e)	HAS_PROPERTY(e, EP_SP_ELEMENT)
 #define HAS_CONTENT(e)		HAS_PROPERTY(e, EP_HAS_CONTENT)
 #define IS_TUBE(e)		HAS_PROPERTY(e, EP_TUBE)
+#define IS_WALL(e)		HAS_PROPERTY(e, EP_WALL)
 
 #define IS_CUSTOM_ELEMENT(e)	((e) >= EL_CUSTOM_START &&	\
 	 			 (e) <= EL_CUSTOM_END)
@@ -844,10 +846,10 @@
 #define FONT_TEXT_2				9
 #define FONT_TEXT_3				10
 #define FONT_TEXT_4				11
-#define FONT_INPUT_1				12
-#define FONT_INPUT_1_ACTIVE			13
-#define FONT_INPUT_2				14
-#define FONT_INPUT_2_ACTIVE			15
+#define FONT_INPUT_1_ACTIVE			12
+#define FONT_INPUT_1				13
+#define FONT_INPUT_2_ACTIVE			14
+#define FONT_INPUT_2				15
 #define FONT_OPTION_OFF				16
 #define FONT_OPTION_ON				17
 #define FONT_VALUE_1				18
@@ -876,7 +878,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.0rc7"
 
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
@@ -1203,6 +1205,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];