#define EP_AMOEBALIVE 0
#define EP_AMOEBOID 1
#define EP_CAN_BE_CRUMBLED 2
-
-#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
#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
#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_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)
#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)
#define EL_KEY_2 33
#define EL_KEY_3 34
#define EL_KEY_4 35
-#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_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_DYNAMITE 44
#define EL_PACMAN 45
#define EL_INVISIBLE_WALL 46
#define EL_EXPANDABLE_WALL_VERTICAL 201
#define EL_EXPANDABLE_WALL_ANY 202
-#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_GATE_1 203
+#define EL_EM_GATE_2 204
+#define EL_EM_GATE_3 205
+#define EL_EM_GATE_4 206
#define EL_EM_KEY_2_FILE 207
#define EL_EM_KEY_3_FILE 208
#define EL_SP_CHIP_BOTTOM (EL_SP_START + 39)
#define EL_SP_END (EL_SP_START + 39)
-#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_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_UNUSED_254 254
#define EL_UNUSED_255 255
#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 + 62)
+#define EL_FIRST_RUNTIME_UNREAL (EL_FIRST_RUNTIME_REAL + 46)
#define EL_BLOCKED (EL_FIRST_RUNTIME_UNREAL + 0)
#define EL_EXPLOSION (EL_FIRST_RUNTIME_UNREAL + 1)
#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
#define PROGRAM_VERSION_MAJOR 2
#define PROGRAM_VERSION_MINOR 2
#define PROGRAM_VERSION_PATCH 0
-#define PROGRAM_VERSION_STRING "2.2.0rc6"
+#define PROGRAM_VERSION_STRING "2.2.0rc7"
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
projects / rocksndiamonds.git / blobdiff