rnd-20030305-1-src
[rocksndiamonds.git] / src / main.h
index 772176a84f786523fa9669a1edc2b6e19facd101..991d0eca677e8daaa8c0f7d0fe8d370d27ad5f3f 100644 (file)
 #define TAPE_IS_EMPTY(x)       ((x).length == 0)
 #define TAPE_IS_STOPPED(x)     (!(x).recording && !(x).playing)
 
-#define PLAYERINFO(x,y)                (&stored_player[StorePlayer[x][y]-EL_PLAYER1])
+#define PLAYERINFO(x,y)                (&stored_player[StorePlayer[x][y]-EL_PLAYER_1])
 #define SHIELD_ON(p)           ((p)->shield_normal_time_left > 0)
 #define PROTECTED_FIELD(x,y)   (IS_TUBE(Feld[x][y]))
 #define PLAYER_PROTECTED(x,y)  (SHIELD_ON(PLAYERINFO(x, y)) ||         \
                                 PROTECTED_FIELD(x, y))
 
-#define PLAYER_NR_GFX(g,i)     ((g) + i * (IMG_PLAYER2 - IMG_PLAYER1))
+#define PLAYER_NR_GFX(g,i)     ((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1))
 
 #define ANIM_FRAMES(g)         (graphic_info[g].anim_frames)
 #define ANIM_DELAY(g)          (graphic_info[g].anim_delay)
 #define EL_WALL                                2
 #define EL_WALL_CRUMBLED               3
 #define EL_ROCK                                4
-#define EL_KEY_OBSOLETE                        5  /* obsolete; mapped to EL_KEY1 */
+#define EL_KEY_OBSOLETE                        5 /* obsolete; mapped to EL_KEY_1 */
 #define EL_EMERALD                     6
 #define EL_EXIT_CLOSED                 7
-#define EL_PLAYER_OBSOLETE             8  /* obsolete; mapped to EL_PLAYER1 */
+#define EL_PLAYER_OBSOLETE             8 /* obsolete; mapped to EL_PLAYER_1 */
 #define EL_BUG                         9
 #define EL_SPACESHIP                   10
 #define EL_YAMYAM                      11
 #define EL_AMOEBA_WET                  23
 #define EL_AMOEBA_DRY                  24
 #define EL_NUT                         25
-#define EL_GAMEOFLIFE                  26
+#define EL_GAME_OF_LIFE                        26
 #define EL_BIOMAZE                     27
 #define EL_DYNAMITE_ACTIVE             28
 #define EL_STONEBLOCK                  29
 #define EL_ROBOT_WHEEL                 30
 #define EL_ROBOT_WHEEL_ACTIVE          31
-#define EL_KEY1                                32
-#define EL_KEY2                                33
-#define EL_KEY3                                34
-#define EL_KEY4                                35
-#define EL_GATE                      36
-#define EL_GATE                      37
-#define EL_GATE                      38
-#define EL_GATE                      39
-#define EL_GATE1_GRAY                  40
-#define EL_GATE2_GRAY                  41
-#define EL_GATE3_GRAY                  42
-#define EL_GATE4_GRAY                  43
+#define EL_KEY_1                       32
+#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_DYNAMITE                    44
 #define EL_PACMAN                      45
 #define EL_INVISIBLE_WALL              46
 #define EL_BD_AMOEBA                   52
 #define EL_TIME_ORB_FULL               53
 #define EL_TIME_ORB_EMPTY              54
-#define EL_WALL_GROWING                        55
+#define EL_EXPANDABLE_WALL             55
 #define EL_BD_DIAMOND                  56
 #define EL_EMERALD_YELLOW              57
 #define EL_WALL_BD_DIAMOND             58
 
 #define EL_UNUSED_63                   63
 
-#define EL_DYNABOMB_NR                 64
-#define EL_DYNABOMB_SZ                 65
-#define EL_DYNABOMB_XL                 66
+#define EL_DYNABOMB_INCREASE_NUMBER    64
+#define EL_DYNABOMB_INCREASE_SIZE      65
+#define EL_DYNABOMB_INCREASE_POWER     66
 #define EL_SOKOBAN_OBJECT              67
 #define EL_SOKOBAN_FIELD_EMPTY         68
 #define EL_SOKOBAN_FIELD_FULL          69
 #define EL_BD_FIREFLY_4                        EL_BD_FIREFLY_UP
 #define EL_BD_BUTTERFLY                        78
 #define EL_BD_FIREFLY                  79
-#define EL_PLAYER                    80
-#define EL_PLAYER                    81
-#define EL_PLAYER                    82
-#define EL_PLAYER                    83
+#define EL_PLAYER_1                    80
+#define EL_PLAYER_2                    81
+#define EL_PLAYER_3                    82
+#define EL_PLAYER_4                    83
 #define EL_BUG_RIGHT                   84
 #define EL_BUG_UP                      85
 #define EL_BUG_LEFT                    86
 #define EL_EMERALD_PURPLE              97
 #define EL_WALL_EMERALD_RED            98
 #define EL_WALL_EMERALD_PURPLE         99
-#define EL_ACIDPOOL_TOPLEFT            100
-#define EL_ACIDPOOL_TOPRIGHT           101
-#define EL_ACIDPOOL_BOTTOMLEFT         102
-#define EL_ACIDPOOL_BOTTOM             103
-#define EL_ACIDPOOL_BOTTOMRIGHT                104
+#define EL_ACID_POOL_TOPLEFT           100
+#define EL_ACID_POOL_TOPRIGHT          101
+#define EL_ACID_POOL_BOTTOMLEFT                102
+#define EL_ACID_POOL_BOTTOM            103
+#define EL_ACID_POOL_BOTTOMRIGHT       104
 #define EL_BD_WALL                     105
 #define EL_BD_ROCK                     106
 #define EL_EXIT_OPEN                   107
 #define EL_PIG                         117
 #define EL_DRAGON                      118
 
-#define EL_EM_KEY1_FILE                        119
+#define EL_EM_KEY_1_FILE               119
 
 #define EL_CHAR_START                  120
 #define EL_CHAR_ASCII0                 (EL_CHAR_START  - 32)
                                         (x) == '|' ? EL_CHAR_CURSOR     : \
                                         EL_CHAR_A + (x) - 'A')
 
-#define EL_WALL_GROWING_X              200
-#define EL_WALL_GROWING_Y              201
-#define EL_WALL_GROWING_XY             202
+#define EL_EXPANDABLE_WALL_HORIZONTAL  200
+#define EL_EXPANDABLE_WALL_VERTICAL    201
+#define EL_EXPANDABLE_WALL_ANY         202
 
-#define EL_EM_GATE                   203
-#define EL_EM_GATE                   204
-#define EL_EM_GATE                   205
-#define EL_EM_GATE                   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_KEY2_FILE                        207
-#define EL_EM_KEY3_FILE                        208
-#define EL_EM_KEY4_FILE                        209
+#define EL_EM_KEY_2_FILE                       207
+#define EL_EM_KEY_3_FILE                       208
+#define EL_EM_KEY_4_FILE                       209
 
 #define EL_SP_START                    210
 #define EL_SP_EMPTY_SPACE              (EL_SP_START + 0)
 #define EL_SP_MURPHY                   (EL_SP_START + 3)
 #define EL_SP_INFOTRON                 (EL_SP_START + 4)
 #define EL_SP_CHIP_SINGLE              (EL_SP_START + 5)
-#define EL_SP_HARD_GRAY                        (EL_SP_START + 6)
+#define EL_SP_HARDWARE_GRAY            (EL_SP_START + 6)
 #define EL_SP_EXIT_CLOSED              (EL_SP_START + 7)
 #define EL_SP_DISK_ORANGE              (EL_SP_START + 8)
-#define EL_SP_PORT1_RIGHT              (EL_SP_START + 9)
-#define EL_SP_PORT1_DOWN               (EL_SP_START + 10)
-#define EL_SP_PORT1_LEFT               (EL_SP_START + 11)
-#define EL_SP_PORT1_UP                 (EL_SP_START + 12)
-#define EL_SP_PORT2_RIGHT              (EL_SP_START + 13)
-#define EL_SP_PORT2_DOWN               (EL_SP_START + 14)
-#define EL_SP_PORT2_LEFT               (EL_SP_START + 15)
-#define EL_SP_PORT2_UP                 (EL_SP_START + 16)
+#define EL_SP_PORT_RIGHT               (EL_SP_START + 9)
+#define EL_SP_PORT_DOWN                        (EL_SP_START + 10)
+#define EL_SP_PORT_LEFT                        (EL_SP_START + 11)
+#define EL_SP_PORT_UP                  (EL_SP_START + 12)
+#define EL_SP_GRAVITY_PORT_RIGHT       (EL_SP_START + 13)
+#define EL_SP_GRAVITY_PORT_DOWN                (EL_SP_START + 14)
+#define EL_SP_GRAVITY_PORT_LEFT                (EL_SP_START + 15)
+#define EL_SP_GRAVITY_PORT_UP          (EL_SP_START + 16)
 #define EL_SP_SNIKSNAK                 (EL_SP_START + 17)
 #define EL_SP_DISK_YELLOW              (EL_SP_START + 18)
 #define EL_SP_TERMINAL                 (EL_SP_START + 19)
 #define EL_SP_DISK_RED                 (EL_SP_START + 20)
-#define EL_SP_PORT_Y                   (EL_SP_START + 21)
-#define EL_SP_PORT_X                   (EL_SP_START + 22)
-#define EL_SP_PORT_XY                  (EL_SP_START + 23)
+#define EL_SP_PORT_VERTICAL            (EL_SP_START + 21)
+#define EL_SP_PORT_HORIZONTAL          (EL_SP_START + 22)
+#define EL_SP_PORT_ANY                 (EL_SP_START + 23)
 #define EL_SP_ELECTRON                 (EL_SP_START + 24)
 #define EL_SP_BUGGY_BASE               (EL_SP_START + 25)
 #define EL_SP_CHIP_LEFT                        (EL_SP_START + 26)
 #define EL_SP_CHIP_RIGHT               (EL_SP_START + 27)
-#define EL_SP_HARD_BASE1               (EL_SP_START + 28)
-#define EL_SP_HARD_GREEN               (EL_SP_START + 29)
-#define EL_SP_HARD_BLUE                        (EL_SP_START + 30)
-#define EL_SP_HARD_RED                 (EL_SP_START + 31)
-#define EL_SP_HARD_YELLOW              (EL_SP_START + 32)
-#define EL_SP_HARD_BASE2               (EL_SP_START + 33)
-#define EL_SP_HARD_BASE3               (EL_SP_START + 34)
-#define EL_SP_HARD_BASE4               (EL_SP_START + 35)
-#define EL_SP_HARD_BASE5               (EL_SP_START + 36)
-#define EL_SP_HARD_BASE6               (EL_SP_START + 37)
-#define EL_SP_CHIP_UPPER               (EL_SP_START + 38)
-#define EL_SP_CHIP_LOWER               (EL_SP_START + 39)
+#define EL_SP_HARDWARE_BASE_1          (EL_SP_START + 28)
+#define EL_SP_HARDWARE_GREEN           (EL_SP_START + 29)
+#define EL_SP_HARDWARE_BLUE            (EL_SP_START + 30)
+#define EL_SP_HARDWARE_RED             (EL_SP_START + 31)
+#define EL_SP_HARDWARE_YELLOW          (EL_SP_START + 32)
+#define EL_SP_HARDWARE_BASE_2          (EL_SP_START + 33)
+#define EL_SP_HARDWARE_BASE_3          (EL_SP_START + 34)
+#define EL_SP_HARDWARE_BASE_4          (EL_SP_START + 35)
+#define EL_SP_HARDWARE_BASE_5          (EL_SP_START + 36)
+#define EL_SP_HARDWARE_BASE_6          (EL_SP_START + 37)
+#define EL_SP_CHIP_TOP                 (EL_SP_START + 38)
+#define EL_SP_CHIP_BOTTOM              (EL_SP_START + 39)
 #define EL_SP_END                      (EL_SP_START + 39)
 
-#define EL_EM_GATE1_GRAY               250
-#define EL_EM_GATE2_GRAY               251
-#define EL_EM_GATE3_GRAY               252
-#define EL_EM_GATE4_GRAY               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_UNUSED_269                  269
 #define EL_UNUSED_270                  270
 
-#define EL_CONVEYOR_BELT1_LEFT         271
-#define EL_CONVEYOR_BELT1_MIDDLE       272
-#define EL_CONVEYOR_BELT1_RIGHT                273
-#define EL_CONVEYOR_BELT1_SWITCH_LEFT  274
-#define EL_CONVEYOR_BELT1_SWITCH_MIDDLE        275
-#define EL_CONVEYOR_BELT1_SWITCH_RIGHT 276
-#define EL_CONVEYOR_BELT2_LEFT         277
-#define EL_CONVEYOR_BELT2_MIDDLE       278
-#define EL_CONVEYOR_BELT2_RIGHT                279
-#define EL_CONVEYOR_BELT2_SWITCH_LEFT  280
-#define EL_CONVEYOR_BELT2_SWITCH_MIDDLE        281
-#define EL_CONVEYOR_BELT2_SWITCH_RIGHT 282
-#define EL_CONVEYOR_BELT3_LEFT         283
-#define EL_CONVEYOR_BELT3_MIDDLE       284
-#define EL_CONVEYOR_BELT3_RIGHT                285
-#define EL_CONVEYOR_BELT3_SWITCH_LEFT  286
-#define EL_CONVEYOR_BELT3_SWITCH_MIDDLE        287
-#define EL_CONVEYOR_BELT3_SWITCH_RIGHT 288
-#define EL_CONVEYOR_BELT4_LEFT         289
-#define EL_CONVEYOR_BELT4_MIDDLE       290
-#define EL_CONVEYOR_BELT4_RIGHT                291
-#define EL_CONVEYOR_BELT4_SWITCH_LEFT  292
-#define EL_CONVEYOR_BELT4_SWITCH_MIDDLE        293
-#define EL_CONVEYOR_BELT4_SWITCH_RIGHT 294
+#define EL_CONVEYOR_BELT_1_LEFT                 271
+#define EL_CONVEYOR_BELT_1_MIDDLE       272
+#define EL_CONVEYOR_BELT_1_RIGHT        273
+#define EL_CONVEYOR_BELT_1_SWITCH_LEFT  274
+#define EL_CONVEYOR_BELT_1_SWITCH_MIDDLE 275
+#define EL_CONVEYOR_BELT_1_SWITCH_RIGHT         276
+#define EL_CONVEYOR_BELT_2_LEFT                 277
+#define EL_CONVEYOR_BELT_2_MIDDLE       278
+#define EL_CONVEYOR_BELT_2_RIGHT        279
+#define EL_CONVEYOR_BELT_2_SWITCH_LEFT  280
+#define EL_CONVEYOR_BELT_2_SWITCH_MIDDLE 281
+#define EL_CONVEYOR_BELT_2_SWITCH_RIGHT         282
+#define EL_CONVEYOR_BELT_3_LEFT                 283
+#define EL_CONVEYOR_BELT_3_MIDDLE       284
+#define EL_CONVEYOR_BELT_3_RIGHT        285
+#define EL_CONVEYOR_BELT_3_SWITCH_LEFT  286
+#define EL_CONVEYOR_BELT_3_SWITCH_MIDDLE 287
+#define EL_CONVEYOR_BELT_3_SWITCH_RIGHT         288
+#define EL_CONVEYOR_BELT_4_LEFT                 289
+#define EL_CONVEYOR_BELT_4_MIDDLE       290
+#define EL_CONVEYOR_BELT_4_RIGHT        291
+#define EL_CONVEYOR_BELT_4_SWITCH_LEFT  292
+#define EL_CONVEYOR_BELT_4_SWITCH_MIDDLE 293
+#define EL_CONVEYOR_BELT_4_SWITCH_RIGHT         294
 #define EL_LANDMINE                    295
 #define EL_ENVELOPE                    296
 #define EL_LIGHT_SWITCH                        297
 #define EL_TIMEGATE_SWITCH             325
 
 #define EL_BALLOON                     326
-#define EL_BALLOON_SEND_LEFT           327
-#define EL_BALLOON_SEND_RIGHT          328
-#define EL_BALLOON_SEND_UP             329
-#define EL_BALLOON_SEND_DOWN           330
-#define EL_BALLOON_SEND_ANY_DIRECTION  331
-
-#define EL_EMC_STEELWALL             332
-#define EL_EMC_STEELWALL             333
-#define EL_EMC_STEELWALL             334
-#define EL_EMC_STEELWALL             335
-#define EL_EMC_WALL_PILLAR_UPPER       336
-#define EL_EMC_WALL_PILLAR_MIDDLE      337
-#define EL_EMC_WALL_PILLAR_LOWER       338
-#define EL_EMC_WALL                  339
-#define EL_EMC_WALL                  340
-#define EL_EMC_WALL                  341
-#define EL_EMC_WALL                  342
-#define EL_EMC_WALL                  343
-
-#define EL_TUBE_ALL                    344
+#define EL_BALLOON_SWITCH_LEFT         327
+#define EL_BALLOON_SWITCH_RIGHT                328
+#define EL_BALLOON_SWITCH_UP           329
+#define EL_BALLOON_SWITCH_DOWN         330
+#define EL_BALLOON_SWITCH_ANY          331
+
+#define EL_EMC_STEELWALL_1             332
+#define EL_EMC_STEELWALL_2             333
+#define EL_EMC_STEELWALL_3             334
+#define EL_EMC_STEELWALL_4             335
+#define EL_EMC_WALL_1                  336
+#define EL_EMC_WALL_2                  337
+#define EL_EMC_WALL_3                  338
+#define EL_EMC_WALL_4                  339
+#define EL_EMC_WALL_5                  340
+#define EL_EMC_WALL_6                  341
+#define EL_EMC_WALL_7                  342
+#define EL_EMC_WALL_8                  343
+
+#define EL_TUBE_ANY                    344
 #define EL_TUBE_VERTICAL               345
 #define EL_TUBE_HORIZONTAL             346
 #define EL_TUBE_VERTICAL_LEFT          347
 /* "real" (and therefore drawable) runtime elements */
 #define EL_FIRST_RUNTIME_REAL          NUM_FILE_ELEMENTS
 
-#define EL_EM_KEY                    (EL_FIRST_RUNTIME_REAL + 0)
-#define EL_EM_KEY                    (EL_FIRST_RUNTIME_REAL + 1)
-#define EL_EM_KEY                    (EL_FIRST_RUNTIME_REAL + 2)
-#define EL_EM_KEY                    (EL_FIRST_RUNTIME_REAL + 3)
-#define EL_DYNABOMB_PLAYER1_ACTIVE     (EL_FIRST_RUNTIME_REAL + 4)
-#define EL_DYNABOMB_PLAYER2_ACTIVE     (EL_FIRST_RUNTIME_REAL + 5)
-#define EL_DYNABOMB_PLAYER3_ACTIVE     (EL_FIRST_RUNTIME_REAL + 6)
-#define EL_DYNABOMB_PLAYER4_ACTIVE     (EL_FIRST_RUNTIME_REAL + 7)
+#define EL_EM_KEY_1                    (EL_FIRST_RUNTIME_REAL + 0)
+#define EL_EM_KEY_2                    (EL_FIRST_RUNTIME_REAL + 1)
+#define EL_EM_KEY_3                    (EL_FIRST_RUNTIME_REAL + 2)
+#define EL_EM_KEY_4                    (EL_FIRST_RUNTIME_REAL + 3)
+#define EL_DYNABOMB_PLAYER_1_ACTIVE    (EL_FIRST_RUNTIME_REAL + 4)
+#define EL_DYNABOMB_PLAYER_2_ACTIVE    (EL_FIRST_RUNTIME_REAL + 5)
+#define EL_DYNABOMB_PLAYER_3_ACTIVE    (EL_FIRST_RUNTIME_REAL + 6)
+#define EL_DYNABOMB_PLAYER_4_ACTIVE    (EL_FIRST_RUNTIME_REAL + 7)
 #define EL_SP_DISK_RED_ACTIVE          (EL_FIRST_RUNTIME_REAL + 8)
 #define EL_SWITCHGATE_OPENING          (EL_FIRST_RUNTIME_REAL + 9)
 #define EL_SWITCHGATE_CLOSING          (EL_FIRST_RUNTIME_REAL + 10)
 #define EL_INVISIBLE_STEELWALL_ACTIVE  (EL_FIRST_RUNTIME_REAL + 15)
 #define EL_INVISIBLE_WALL_ACTIVE       (EL_FIRST_RUNTIME_REAL + 16)
 #define EL_INVISIBLE_SAND_ACTIVE       (EL_FIRST_RUNTIME_REAL + 17)
-#define EL_CONVEYOR_BELT1_LEFT_ACTIVE  (EL_FIRST_RUNTIME_REAL + 18)
-#define EL_CONVEYOR_BELT1_MIDDLE_ACTIVE        (EL_FIRST_RUNTIME_REAL + 19)
-#define EL_CONVEYOR_BELT1_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 20)
-#define EL_CONVEYOR_BELT2_LEFT_ACTIVE  (EL_FIRST_RUNTIME_REAL + 21)
-#define EL_CONVEYOR_BELT2_MIDDLE_ACTIVE        (EL_FIRST_RUNTIME_REAL + 22)
-#define EL_CONVEYOR_BELT2_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 23)
-#define EL_CONVEYOR_BELT3_LEFT_ACTIVE  (EL_FIRST_RUNTIME_REAL + 24)
-#define EL_CONVEYOR_BELT3_MIDDLE_ACTIVE        (EL_FIRST_RUNTIME_REAL + 25)
-#define EL_CONVEYOR_BELT3_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 26)
-#define EL_CONVEYOR_BELT4_LEFT_ACTIVE  (EL_FIRST_RUNTIME_REAL + 27)
-#define EL_CONVEYOR_BELT4_MIDDLE_ACTIVE        (EL_FIRST_RUNTIME_REAL + 28)
-#define EL_CONVEYOR_BELT4_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 29)
+#define EL_CONVEYOR_BELT_1_LEFT_ACTIVE  (EL_FIRST_RUNTIME_REAL + 18)
+#define EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 19)
+#define EL_CONVEYOR_BELT_1_RIGHT_ACTIVE         (EL_FIRST_RUNTIME_REAL + 20)
+#define EL_CONVEYOR_BELT_2_LEFT_ACTIVE  (EL_FIRST_RUNTIME_REAL + 21)
+#define EL_CONVEYOR_BELT_2_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 22)
+#define EL_CONVEYOR_BELT_2_RIGHT_ACTIVE         (EL_FIRST_RUNTIME_REAL + 23)
+#define EL_CONVEYOR_BELT_3_LEFT_ACTIVE  (EL_FIRST_RUNTIME_REAL + 24)
+#define EL_CONVEYOR_BELT_3_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 25)
+#define EL_CONVEYOR_BELT_3_RIGHT_ACTIVE         (EL_FIRST_RUNTIME_REAL + 26)
+#define EL_CONVEYOR_BELT_4_LEFT_ACTIVE  (EL_FIRST_RUNTIME_REAL + 27)
+#define EL_CONVEYOR_BELT_4_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 28)
+#define EL_CONVEYOR_BELT_4_RIGHT_ACTIVE         (EL_FIRST_RUNTIME_REAL + 29)
 #define EL_EXIT_OPENING                        (EL_FIRST_RUNTIME_REAL + 30)
 #define EL_SP_EXIT_OPEN                        (EL_FIRST_RUNTIME_REAL + 31)
 #define EL_SP_TERMINAL_ACTIVE          (EL_FIRST_RUNTIME_REAL + 32)
 #define EL_SP_BUGGY_BASE_ACTIVATING    (EL_FIRST_RUNTIME_REAL + 33)
 #define EL_SP_BUGGY_BASE_ACTIVE                (EL_FIRST_RUNTIME_REAL + 34)
 #define EL_SP_MURPHY_CLONE             (EL_FIRST_RUNTIME_REAL + 35)
-#define EL_AMOEBA_DRIPPING             (EL_FIRST_RUNTIME_REAL + 36)
+#define EL_AMOEBA_DROPPING             (EL_FIRST_RUNTIME_REAL + 36)
 #define EL_QUICKSAND_EMPTYING          (EL_FIRST_RUNTIME_REAL + 37)
 #define EL_MAGIC_WALL_ACTIVE           (EL_FIRST_RUNTIME_REAL + 38)
 #define EL_BD_MAGIC_WALL_ACTIVE                (EL_FIRST_RUNTIME_REAL + 39)
 
 #define EL_BLOCKED                     (EL_FIRST_RUNTIME_UNREAL + 0)
 #define EL_EXPLOSION                   (EL_FIRST_RUNTIME_UNREAL + 1)
-#define EL_NUT_CRACKING                        (EL_FIRST_RUNTIME_UNREAL + 2)
+#define EL_NUT_BREAKING                        (EL_FIRST_RUNTIME_UNREAL + 2)
 #define EL_ACID_SPLASH_LEFT            (EL_FIRST_RUNTIME_UNREAL + 3)
 #define EL_ACID_SPLASH_RIGHT           (EL_FIRST_RUNTIME_UNREAL + 4)
-#define EL_AMOEBA_CREATING             (EL_FIRST_RUNTIME_UNREAL + 5)
+#define EL_AMOEBA_GROWING              (EL_FIRST_RUNTIME_UNREAL + 5)
 #define EL_AMOEBA_SHRINKING            (EL_FIRST_RUNTIME_UNREAL + 6)
-#define EL_WALL_GROWING_ACTIVE         (EL_FIRST_RUNTIME_UNREAL + 7)
+#define EL_EXPANDABLE_WALL_GROWING     (EL_FIRST_RUNTIME_UNREAL + 7)
 #define EL_FLAMES                      (EL_FIRST_RUNTIME_UNREAL + 8)
 #define EL_PLAYER_IS_LEAVING           (EL_FIRST_RUNTIME_UNREAL + 9)
 #define EL_QUICKSAND_FILLING           (EL_FIRST_RUNTIME_UNREAL + 10)
 #define ACTION_DIGGING                         4
 #define ACTION_SNAPPING                                5
 #define ACTION_COLLECTING                      6
-#define ACTION_PUSHING                         7
-#define ACTION_PASSING                         8
-#define ACTION_IMPACT                          9
-#define ACTION_CRACKING                                10
+#define ACTION_DROPPING                                7
+#define ACTION_PUSHING                         8
+#define ACTION_PASSING                         9
+#define ACTION_IMPACT                          10
 #define ACTION_BREAKING                                11
 #define ACTION_ACTIVATING                      12
-#define ACTION_OPENING                         13
-#define ACTION_CLOSING                         14
-#define ACTION_EATING                          15
+#define ACTION_DEACTIVATING                    13
+#define ACTION_OPENING                         14
+#define ACTION_CLOSING                         15
 #define ACTION_ATTACKING                       16
 #define ACTION_GROWING                         17
 #define ACTION_SHRINKING                       18
 #define ACTION_ACTIVE                          19
-#define ACTION_OTHER                           20
+#define ACTION_FILLING                         20
+#define ACTION_EMPTYING                                21
+#define ACTION_CHANGING                                22
+#define ACTION_EXPLODING                       23
+#define ACTION_DYING                           24
+#define ACTION_OTHER                           25
 
-#define NUM_ACTIONS                            21
+#define NUM_ACTIONS                            26
 
 /* values for special image configuration suffixes */
 #define GFX_SPECIAL_ARG_MAIN                   0
@@ -1053,7 +1058,7 @@ struct GlobalInfo
 struct ElementInfo
 {
   char *token_name;            /* element token used in config files */
-  char *sound_class_name;      /* classification for custom sound effects */
+  char *class_name;            /* element class used in config files */
   char *editor_description;    /* short description for level editor */
   char *custom_description;    /* custom description for level editor */