/* values for 'Elementeigenschaften2' */
#define EP_BIT_BELT (1 << 0)
-#define EP_BIT_BELT_SWITCH (1 << 1)
-#define EP_BIT_TUBE (1 << 2)
-#define EP_BIT_EM_SLIPPERY_WALL (1 << 3)
+#define EP_BIT_BELT_ACTIVE (1 << 1)
+#define EP_BIT_BELT_SWITCH (1 << 2)
+#define EP_BIT_TUBE (1 << 3)
+#define EP_BIT_EM_SLIPPERY_WALL (1 << 4)
#define IS_AMOEBALIVE(e) (Elementeigenschaften1[e] & EP_BIT_AMOEBALIVE)
#define IS_AMOEBOID(e) (Elementeigenschaften1[e] & EP_BIT_AMOEBOID)
#define IS_QUICK_GATE(e) (Elementeigenschaften1[e] & EP_BIT_QUICK_GATE)
#define IS_OVER_PLAYER(e) (Elementeigenschaften1[e] & EP_BIT_OVER_PLAYER)
#define IS_ACTIVE_BOMB(e) (Elementeigenschaften1[e] & EP_BIT_ACTIVE_BOMB)
+
#define IS_BELT(e) (Elementeigenschaften2[e] & EP_BIT_BELT)
+#define IS_BELT_ACTIVE(e) (Elementeigenschaften2[e] & EP_BIT_BELT_ACTIVE)
#define IS_BELT_SWITCH(e) (Elementeigenschaften2[e] & EP_BIT_BELT_SWITCH)
#define IS_TUBE(e) (Elementeigenschaften2[e] & EP_BIT_TUBE)
#define IS_EM_SLIPPERY_WALL(e) (Elementeigenschaften2[e] & EP_BIT_EM_SLIPPERY_WALL)
/* "real" (and therefore drawable) runtime elements */
#define EL_FIRST_RUNTIME_REAL NUM_FILE_ELEMENTS
-#define EL_MAGIC_WALL_EMPTY (EL_FIRST_RUNTIME_REAL + 0)
-#define EL_BD_MAGIC_WALL_EMPTY (EL_FIRST_RUNTIME_REAL + 1)
+#define EL_MAGIC_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 0)
+#define EL_BD_MAGIC_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 1)
#define EL_MAGIC_WALL_FULL (EL_FIRST_RUNTIME_REAL + 2)
#define EL_BD_MAGIC_WALL_FULL (EL_FIRST_RUNTIME_REAL + 3)
#define EL_MAGIC_WALL_DEAD (EL_FIRST_RUNTIME_REAL + 4)
#define EL_BD_MAGIC_WALL_EMPTYING (EL_FIRST_RUNTIME_REAL + 27)
#define EL_AMOEBA_DRIPPING (EL_FIRST_RUNTIME_REAL + 28)
#define EL_SP_EXIT_OPEN (EL_FIRST_RUNTIME_REAL + 29)
+#define EL_INVISIBLE_STEELWALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 30)
+#define EL_INVISIBLE_SAND_ACTIVE (EL_FIRST_RUNTIME_REAL + 31)
+#define EL_INVISIBLE_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 32)
+#define EL_CONVEYOR_BELT1_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 33)
+#define EL_CONVEYOR_BELT1_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 34)
+#define EL_CONVEYOR_BELT1_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 35)
+#define EL_CONVEYOR_BELT2_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 36)
+#define EL_CONVEYOR_BELT2_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 37)
+#define EL_CONVEYOR_BELT2_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 38)
+#define EL_CONVEYOR_BELT3_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 39)
+#define EL_CONVEYOR_BELT3_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 40)
+#define EL_CONVEYOR_BELT3_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 41)
+#define EL_CONVEYOR_BELT4_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 42)
+#define EL_CONVEYOR_BELT4_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 43)
+#define EL_CONVEYOR_BELT4_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 44)
/* "unreal" (and therefore not drawable) runtime elements */
-#define EL_FIRST_RUNTIME_UNREAL (EL_FIRST_RUNTIME_REAL + 30)
+#define EL_FIRST_RUNTIME_UNREAL (EL_FIRST_RUNTIME_REAL + 45)
#define EL_BLOCKED (EL_FIRST_RUNTIME_UNREAL + 0)
#define EL_EXPLOSION (EL_FIRST_RUNTIME_UNREAL + 1)
#define IMG_MAGIC_WALL 82
#define IMG_MAGIC_WALL_ACTIVE 83
#define IMG_MAGIC_WALL_FILLING 84
-#define IMG_MAGIC_WALL_EMPTYING 85
-#define IMG_BD_MAGIC_WALL 86
-#define IMG_BD_MAGIC_WALL_ACTIVE 87
-#define IMG_BD_MAGIC_WALL_FILLING 88
-#define IMG_BD_MAGIC_WALL_EMPTYING 89
-#define IMG_WALL_EMERALD 90
-#define IMG_WALL_DIAMOND 91
-#define IMG_WALL_EMERALD_RED 92
-#define IMG_WALL_EMERALD_PURPLE 93
-#define IMG_WALL_EMERALD_YELLOW 94
-#define IMG_WALL_BD_DIAMOND 95
-#define IMG_EMERALD_RED 96
-#define IMG_EMERALD_RED_FALLING 97
-#define IMG_EMERALD_PURPLE 98
-#define IMG_EMERALD_PURPLE_FALLING 99
-#define IMG_EMERALD_YELLOW 100
-#define IMG_EMERALD_YELLOW_FALLING 101
-#define IMG_WALL_GROWING_XY 102
-#define IMG_WALL_GROWING_X 103
-#define IMG_WALL_GROWING_Y 104
-#define IMG_DYNABOMB_XL 105
-#define IMG_BLACK_ORB 106
-#define IMG_SPEED_PILL 107
-#define IMG_BD_DIAMOND 108
-#define IMG_BD_DIAMOND_FALLING 109
-#define IMG_WALL_GROWING_RIGHT 110
-#define IMG_WALL_GROWING_LEFT 111
-#define IMG_EXIT_CLOSED 112
-#define IMG_EXIT_OPENING 113
-#define IMG_EXIT_OPEN 114
-#define IMG_DARK_YAMYAM 115
-#define IMG_DYNABOMB_ACTIVE 116
-#define IMG_DYNABOMB_NR 117
-#define IMG_DYNABOMB_SZ 118
-#define IMG_ARROW_LEFT 119
-#define IMG_ARROW_RIGHT 120
-#define IMG_ARROW_UP 121
-#define IMG_ARROW_DOWN 122
+#define IMG_MAGIC_WALL_FULL 85
+#define IMG_MAGIC_WALL_EMPTYING 86
+#define IMG_MAGIC_WALL_DEAD 87
+#define IMG_BD_MAGIC_WALL 88
+#define IMG_BD_MAGIC_WALL_ACTIVE 89
+#define IMG_BD_MAGIC_WALL_FILLING 90
+#define IMG_BD_MAGIC_WALL_FULL 91
+#define IMG_BD_MAGIC_WALL_EMPTYING 92
+#define IMG_BD_MAGIC_WALL_DEAD 93
+#define IMG_WALL_EMERALD 94
+#define IMG_WALL_DIAMOND 95
+#define IMG_WALL_EMERALD_RED 96
+#define IMG_WALL_EMERALD_PURPLE 97
+#define IMG_WALL_EMERALD_YELLOW 98
+#define IMG_WALL_BD_DIAMOND 99
+#define IMG_EMERALD_RED 100
+#define IMG_EMERALD_RED_FALLING 101
+#define IMG_EMERALD_PURPLE 102
+#define IMG_EMERALD_PURPLE_FALLING 103
+#define IMG_EMERALD_YELLOW 104
+#define IMG_EMERALD_YELLOW_FALLING 105
+#define IMG_WALL_GROWING_XY 106
+#define IMG_WALL_GROWING_X 107
+#define IMG_WALL_GROWING_Y 108
+#define IMG_DYNABOMB_XL 109
+#define IMG_BLACK_ORB 110
+#define IMG_SPEED_PILL 111
+#define IMG_BD_DIAMOND 112
+#define IMG_BD_DIAMOND_FALLING 113
+#define IMG_WALL_GROWING_RIGHT 114
+#define IMG_WALL_GROWING_LEFT 115
+#define IMG_EXIT_CLOSED 116
+#define IMG_EXIT_OPENING 117
+#define IMG_EXIT_OPEN 118
+#define IMG_DARK_YAMYAM 119
+#define IMG_DYNABOMB_ACTIVE 120
+#define IMG_DYNABOMB_NR 121
+#define IMG_DYNABOMB_SZ 122
#define IMG_BD_BUTTERFLY 123
#define IMG_BD_BUTTERFLY_MOVING 124
#define IMG_BD_BUTTERFLY_RIGHT 125
#define IMG_SATELLITE_MOVING 256
#define IMG_ACID_SPLASHING_LEFT 257
#define IMG_ACID_SPLASHING_RIGHT 258
-#define IMG_SPARK_BLUE 259
-#define IMG_SPARK_WHITE 260
+#define IMG_TWINKLE_BLUE 259
+#define IMG_TWINKLE_WHITE 260
#define IMG_DRAGON_FIRE_LEFT1 261
#define IMG_DRAGON_FIRE_LEFT2 262
#define IMG_DRAGON_FIRE_LEFT3 263
#define IMG_SP_TERMINAL 332
#define IMG_SP_TERMINAL_ACTIVE 333
#define IMG_SP_BUGGY_BASE 334
-#define IMG_SP_BUGGY_BASE_ACTIVATING 335
+#define IMG_SP_BUGGY_BASE_ACTIVE 335
#define IMG_SP_HARD_BASE1 336
#define IMG_SP_HARD_BASE2 337
#define IMG_SP_HARD_BASE3 338
#define IMG_TUBE_RIGHT_UP 465
#define IMG_TUBE_HORIZONTAL_UP 466
#define IMG_TUBE_LEFT_UP 467
-#define IMG_TRAP_INACTIVE 468
+#define IMG_TRAP 468
#define IMG_TRAP_ACTIVE 469
-#define IMG_TRAP_ACTIVATING 470
-#define IMG_BD_WALL 471
-#define IMG_BD_ROCK 472
-#define IMG_BD_ROCK_FALLING 473
-#define IMG_BD_ROCK_PUSHING 474
-#define IMG_DX_BOMB 475
+#define IMG_BD_WALL 470
+#define IMG_BD_ROCK 471
+#define IMG_BD_ROCK_FALLING 472
+#define IMG_BD_ROCK_PUSHING 473
+#define IMG_DX_SUPABOMB 474
-#define NUM_IMAGE_FILES 476
+#define NUM_IMAGE_FILES 475
/* values for sound configuration suffixes */
#define SND_SP_EMPTY_SPACE_DIGGING 18
#define SND_SP_BASE_DIGGING 19
#define SND_SP_BUGGY_BASE_DIGGING 20
-#define SND_SP_BUGGY_BASE_ACTIVATING 21
+#define SND_SP_BUGGY_BASE_ACTIVE 21
#define SND_SP_INFOTRON_COLLECTING 22
#define SND_SP_INFOTRON_IMPACT 23
#define SND_SP_ZONK_PUSHING 24
projects / rocksndiamonds.git / blobdiff