X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=3f14bd078a22984c3bb4b8f76987c83a6a141785;hb=2edf06a7d09c607a6dc3751368cca227ab67660d;hp=4d05cfd3420d1c596bd06cfff169d3bb1d4fd88f;hpb=3c4bdac5671bde161609293f4c5b504dee4d3aa1;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 4d05cfd3..3f14bd07 100644
--- a/src/main.h
+++ b/src/main.h
@@ -169,8 +169,9 @@
 #define NUM_ELEMENT_PROPERTIES		90
 
 #define NUM_EP_BITFIELDS		((NUM_ELEMENT_PROPERTIES + 31) / 32)
-#define EP_BITFIELD_BASE		0
+#define EP_BITFIELD_BASE_NR		0
 
+#define EP_BITMASK_BASE_DEFAULT		(1 << EP_CAN_MOVE_INTO_ACID)
 #define EP_BITMASK_DEFAULT		0
 
 #define PROPERTY_BIT(p)			(1 << ((p) % 32))
@@ -233,8 +234,8 @@
 
 #define CE_BITMASK_DEFAULT		0
 
-#define EVENT_BITFIELD_NR(e)		(e / 32)
-#define EVENT_BIT(e)			(1 << ((e) % 32))
+#define CH_EVENT_BITFIELD_NR(e)		(e / 32)
+#define CH_EVENT_BIT(e)			(1 << ((e) % 32))
 
 #define CH_EVENT_VAR(e,c)		(element_info[e].change->has_event[c])
 #define CH_ANY_EVENT_VAR(e,c)		(element_info[e].has_change_event[c])
@@ -819,8 +820,6 @@
 #define STD_ELEMENT_CONTENTS	4
 #define MAX_ELEMENT_CONTENTS	8
 
-#define LEVEL_SCORE_ELEMENTS	16	/* level elements with score */
-
 /* often used screen positions */
 #define SX			8
 #define SY			8
@@ -878,6 +877,10 @@
 #define SC_CRYSTAL		11
 #define SC_PEARL		12
 #define SC_SHIELD		13
+#define SC_UNKNOWN_14		14
+#define SC_UNKNOWN_15		15
+
+#define LEVEL_SCORE_ELEMENTS	16	/* level elements with score */
 
 
 /* "real" level file elements */