rnd-20020921-3-src
[rocksndiamonds.git] / src / init.c
index 1861e0485c31663f7e8867a5067a3dc1c50c7cfd..7c877f2dc26e56e4464d294744fa6d6138ace8a2 100644 (file)
@@ -570,10 +570,9 @@ void InitElementInfo()
     { EL_WALL,                         GFX_MAUERWERK           },
     { EL_WALL_CRUMBLED,                        GFX_FELSBODEN           },
     { EL_ROCK,                         GFX_FELSBROCKEN         },
-    { EL_KEY,                          GFX_SCHLUESSEL          },
     { EL_EMERALD,                      GFX_EDELSTEIN           },
     { EL_EXIT_CLOSED,                  GFX_AUSGANG_ZU          },
-    { EL_AUSGANG_ACT,                  GFX_AUSGANG_ACT         },
+    { EL_EXIT_OPENING,                 GFX_AUSGANG_ACT         },
     { EL_EXIT_OPEN,                    GFX_AUSGANG_AUF         },
     { EL_SP_EXIT_OPEN,                 GFX_SP_EXIT             },
     { EL_PLAYER,                       GFX_SPIELFIGUR          },
@@ -591,16 +590,16 @@ void InitElementInfo()
     { EL_SPACESHIP_UP,                 GFX_FLIEGER_UP          },
     { EL_SPACESHIP_LEFT,               GFX_FLIEGER_LEFT        },
     { EL_SPACESHIP_DOWN,               GFX_FLIEGER_DOWN        },
-    { EL_BUTTERFLY,                    GFX_BUTTERFLY           },
-    { EL_BUTTERFLY_RIGHT,              GFX_BUTTERFLY_RIGHT     },
-    { EL_BUTTERFLY_UP,                 GFX_BUTTERFLY_UP        },
-    { EL_BUTTERFLY_LEFT,               GFX_BUTTERFLY_LEFT      },
-    { EL_BUTTERFLY_DOWN,               GFX_BUTTERFLY_DOWN      },
-    { EL_FIREFLY,                      GFX_FIREFLY             },
-    { EL_FIREFLY_RIGHT,                        GFX_FIREFLY_RIGHT       },
-    { EL_FIREFLY_UP,                   GFX_FIREFLY_UP          },
-    { EL_FIREFLY_LEFT,                 GFX_FIREFLY_LEFT        },
-    { EL_FIREFLY_DOWN,                 GFX_FIREFLY_DOWN        },
+    { EL_BD_BUTTERFLY,                 GFX_BUTTERFLY           },
+    { EL_BD_BUTTERFLY_RIGHT,           GFX_BUTTERFLY_RIGHT     },
+    { EL_BD_BUTTERFLY_UP,              GFX_BUTTERFLY_UP        },
+    { EL_BD_BUTTERFLY_LEFT,            GFX_BUTTERFLY_LEFT      },
+    { EL_BD_BUTTERFLY_DOWN,            GFX_BUTTERFLY_DOWN      },
+    { EL_BD_FIREFLY,                   GFX_FIREFLY             },
+    { EL_BD_FIREFLY_RIGHT,             GFX_FIREFLY_RIGHT       },
+    { EL_BD_FIREFLY_UP,                        GFX_FIREFLY_UP          },
+    { EL_BD_FIREFLY_LEFT,              GFX_FIREFLY_LEFT        },
+    { EL_BD_FIREFLY_DOWN,              GFX_FIREFLY_DOWN        },
     { EL_YAMYAM,                       GFX_MAMPFER             },
     { EL_ROBOT,                                GFX_ROBOT               },
     { EL_STEELWALL,                    GFX_BETON               },
@@ -673,11 +672,11 @@ void InitElementInfo()
     { EL_WALL_EMERALD_RED,             GFX_ERZ_EDEL_ROT        },
     { EL_WALL_EMERALD_PURPLE,          GFX_ERZ_EDEL_LILA       },
     { EL_DARK_YAMYAM,                  GFX_MAMPFER2            },
-    { EL_MAGIC_WALL_BD_OFF,            GFX_MAGIC_WALL_BD_OFF   },
-    { EL_MAGIC_WALL_BD_EMPTY,          GFX_MAGIC_WALL_BD_EMPTY },
-    { EL_MAGIC_WALL_BD_EMPTYING,       GFX_MAGIC_WALL_BD_EMPTY },
-    { EL_MAGIC_WALL_BD_FULL,           GFX_MAGIC_WALL_BD_FULL  },
-    { EL_MAGIC_WALL_BD_DEAD,           GFX_MAGIC_WALL_BD_DEAD  },
+    { EL_BD_MAGIC_WALL,                        GFX_MAGIC_WALL_BD_OFF   },
+    { EL_BD_MAGIC_WALL_EMPTY,          GFX_MAGIC_WALL_BD_EMPTY },
+    { EL_BD_MAGIC_WALL_EMPTYING,       GFX_MAGIC_WALL_BD_EMPTY },
+    { EL_BD_MAGIC_WALL_FULL,           GFX_MAGIC_WALL_BD_FULL  },
+    { EL_BD_MAGIC_WALL_DEAD,           GFX_MAGIC_WALL_BD_DEAD  },
     { EL_DYNABOMB_ACTIVE_1,            GFX_DYNABOMB            },
     { EL_DYNABOMB_ACTIVE_2,            GFX_DYNABOMB            },
     { EL_DYNABOMB_ACTIVE_3,            GFX_DYNABOMB            },
@@ -685,21 +684,21 @@ void InitElementInfo()
     { EL_DYNABOMB_NR,                  GFX_DYNABOMB_NR         },
     { EL_DYNABOMB_SZ,                  GFX_DYNABOMB_SZ         },
     { EL_DYNABOMB_XL,                  GFX_DYNABOMB_XL         },
-    { EL_SOKOBAN_OBJEKT,               GFX_SOKOBAN_OBJEKT      },
-    { EL_SOKOBAN_FELD_LEER,            GFX_SOKOBAN_FELD_LEER   },
-    { EL_SOKOBAN_FELD_VOLL,            GFX_SOKOBAN_FELD_VOLL   },
+    { EL_SOKOBAN_OBJECT,               GFX_SOKOBAN_OBJEKT      },
+    { EL_SOKOBAN_FIELD_EMPTY,          GFX_SOKOBAN_FELD_LEER   },
+    { EL_SOKOBAN_FIELD_FULL,           GFX_SOKOBAN_FELD_VOLL   },
     { EL_MOLE,                         GFX_MOLE                },
     { EL_PENGUIN,                      GFX_PINGUIN             },
     { EL_PIG,                          GFX_SCHWEIN             },
     { EL_DRAGON,                       GFX_DRACHE              },
     { EL_SATELLITE,                    GFX_SONDE               },
-    { EL_ARROW_LEFT,                   GFX_PFEIL_LEFT          },
-    { EL_ARROW_RIGHT,                  GFX_PFEIL_RIGHT         },
-    { EL_ARROW_UP,                     GFX_PFEIL_UP            },
-    { EL_ARROW_DOWN,                   GFX_PFEIL_DOWN          },
+    { EL_ARROW_BLUE_LEFT,              GFX_PFEIL_LEFT          },
+    { EL_ARROW_BLUE_RIGHT,             GFX_PFEIL_RIGHT         },
+    { EL_ARROW_BLUE_UP,                        GFX_PFEIL_UP            },
+    { EL_ARROW_BLUE_DOWN,              GFX_PFEIL_DOWN          },
     { EL_SPEED_PILL,                   GFX_SPEED_PILL          },
     { EL_SP_TERMINAL_ACTIVE,           GFX_SP_TERMINAL         },
-    { EL_SP_BUG_ACTIVE,                        GFX_SP_BUG_ACTIVE       },
+    { EL_SP_BUGGY_BASE_ACTIVE,         GFX_SP_BUG_ACTIVE       },
     { EL_SP_ZONK,                      GFX_SP_ZONK             },
     { EL_INVISIBLE_STEELWALL,          GFX_INVISIBLE_STEEL     },
     { EL_BLACK_ORB,                    GFX_BLACK_ORB           },
@@ -727,7 +726,7 @@ void InitElementInfo()
     { EL_DOOR_WHITE_GRAY,              GFX_DOOR_WHITE_GRAY     },
     { EL_KEY_WHITE,                    GFX_KEY_WHITE           },
     { EL_SHIELD_NORMAL,                        GFX_SHIELD_PASSIVE      },
-    { EL_SHIELD_ACTIVE,                        GFX_SHIELD_ACTIVE       },
+    { EL_SHIELD_DEADLY,                        GFX_SHIELD_ACTIVE       },
     { EL_EXTRA_TIME,                   GFX_EXTRA_TIME          },
     { EL_SWITCHGATE_OPEN,              GFX_SWITCHGATE_OPEN     },
     { EL_SWITCHGATE_CLOSED,            GFX_SWITCHGATE_CLOSED   },
@@ -778,19 +777,19 @@ void InitElementInfo()
     { EL_MOLE_UP,                      GFX_MOLE_UP             },
     { EL_MOLE_DOWN,                    GFX_MOLE_DOWN           },
     { EL_STEELWALL_SLANTED,            GFX_STEEL_SLANTED       },
-    { EL_SAND_INVISIBLE,               GFX_SAND_INVISIBLE      },
+    { EL_INVISIBLE_SAND,               GFX_SAND_INVISIBLE      },
     { EL_DX_UNKNOWN_15,                        GFX_DX_UNKNOWN_15       },
     { EL_DX_UNKNOWN_42,                        GFX_DX_UNKNOWN_42       },
     { EL_TIMEGATE_OPEN,                        GFX_TIMEGATE_OPEN       },
     { EL_TIMEGATE_CLOSED,              GFX_TIMEGATE_CLOSED     },
-    { EL_TIMEGATE_SWITCH_ON,           GFX_TIMEGATE_SWITCH     },
-    { EL_TIMEGATE_SWITCH_OFF,          GFX_TIMEGATE_SWITCH     },
+    { EL_TIMEGATE_SWITCH_ACTIVE,       GFX_TIMEGATE_SWITCH     },
+    { EL_TIMEGATE_SWITCH,              GFX_TIMEGATE_SWITCH     },
     { EL_BALLOON,                      GFX_BALLOON             },
     { EL_BALLOON_SEND_LEFT,            GFX_BALLOON_SEND_LEFT   },
     { EL_BALLOON_SEND_RIGHT,           GFX_BALLOON_SEND_RIGHT  },
     { EL_BALLOON_SEND_UP,              GFX_BALLOON_SEND_UP     },
     { EL_BALLOON_SEND_DOWN,            GFX_BALLOON_SEND_DOWN   },
-    { EL_BALLOON_SEND_ANY,             GFX_BALLOON_SEND_ANY    },
+    { EL_BALLOON_SEND_ANY_DIRECTION,   GFX_BALLOON_SEND_ANY    },
     { EL_EMC_STEELWALL1,               GFX_EMC_STEEL_WALL_1    },
     { EL_EMC_STEELWALL2,               GFX_EMC_STEEL_WALL_2    },
     { EL_EMC_STEELWALL3,               GFX_EMC_STEEL_WALL_3    },
@@ -803,20 +802,20 @@ void InitElementInfo()
     { EL_EMC_WALL6,                    GFX_EMC_WALL_6          },
     { EL_EMC_WALL7,                    GFX_EMC_WALL_7          },
     { EL_EMC_WALL8,                    GFX_EMC_WALL_8          },
-    { EL_TUBE_CROSS,                   GFX_TUBE_CROSS          },
+    { EL_TUBE_ALL,                     GFX_TUBE_CROSS          },
     { EL_TUBE_VERTICAL,                        GFX_TUBE_VERTICAL       },
     { EL_TUBE_HORIZONTAL,              GFX_TUBE_HORIZONTAL     },
-    { EL_TUBE_VERT_LEFT,               GFX_TUBE_VERT_LEFT      },
-    { EL_TUBE_VERT_RIGHT,              GFX_TUBE_VERT_RIGHT     },
-    { EL_TUBE_HORIZ_UP,                        GFX_TUBE_HORIZ_UP       },
-    { EL_TUBE_HORIZ_DOWN,              GFX_TUBE_HORIZ_DOWN     },
+    { EL_TUBE_VERTICAL_LEFT,           GFX_TUBE_VERT_LEFT      },
+    { EL_TUBE_VERTICAL_RIGHT,          GFX_TUBE_VERT_RIGHT     },
+    { EL_TUBE_HORIZONTAL_UP,           GFX_TUBE_HORIZ_UP       },
+    { EL_TUBE_HORIZONTAL_DOWN,         GFX_TUBE_HORIZ_DOWN     },
     { EL_TUBE_LEFT_UP,                 GFX_TUBE_LEFT_UP        },
     { EL_TUBE_LEFT_DOWN,               GFX_TUBE_LEFT_DOWN      },
     { EL_TUBE_RIGHT_UP,                        GFX_TUBE_RIGHT_UP       },
     { EL_TUBE_RIGHT_DOWN,              GFX_TUBE_RIGHT_DOWN     },
     { EL_SPRING,                       GFX_SPRING              },
     { EL_SPRING_MOVING,                        GFX_SPRING              },
-    { EL_TRAP_INACTIVE,                        GFX_TRAP_INACTIVE       },
+    { EL_TRAP                        GFX_TRAP_INACTIVE       },
     { EL_TRAP_ACTIVE,                  GFX_TRAP_ACTIVE         },
     { EL_BD_WALL,                      GFX_BD_WALL             },
     { EL_BD_ROCK,                      GFX_BD_ROCK             },
@@ -835,21 +834,6 @@ void InitElementInfo()
   }
   element_to_direction_graphic[] =
   {
-    {
-      EL_SPACESHIP,
-      IMG_SPACESHIP_LEFT,      IMG_SPACESHIP_RIGHT,
-      IMG_SPACESHIP_UP,                IMG_SPACESHIP_DOWN
-    },
-    {
-      EL_BUG,
-      IMG_BUG_LEFT,            IMG_BUG_RIGHT,
-      IMG_BUG_UP,              IMG_BUG_DOWN
-    },
-    {
-      EL_PACMAN,
-      IMG_PACMAN_LEFT,         IMG_PACMAN_RIGHT,
-      IMG_PACMAN_UP,           IMG_PACMAN_DOWN
-    },
     {
       EL_PLAYER1,
       IMG_PLAYER1_LEFT,                IMG_PLAYER1_RIGHT,
@@ -871,14 +855,29 @@ void InitElementInfo()
       IMG_PLAYER4_UP,          IMG_PLAYER4_DOWN
     },
     {
-      EL_PIG,
-      IMG_PIG_LEFT,            IMG_PIG_RIGHT,
-      IMG_PIG_UP,              IMG_PIG_DOWN
+      EL_SP_MURPHY,
+      IMG_SP_MURPHY_LEFT,      IMG_SP_MURPHY_RIGHT,
+      IMG_SP_MURPHY_UP,                IMG_SP_MURPHY_DOWN
     },
     {
-      EL_DRAGON,
-      IMG_DRAGON_LEFT,         IMG_DRAGON_RIGHT,
-      IMG_DRAGON_UP,           IMG_DRAGON_DOWN
+      EL_SP_SNIKSNAK,
+      IMG_SP_SNIKSNAK_LEFT,    IMG_SP_SNIKSNAK_RIGHT,
+      IMG_SP_SNIKSNAK_UP,      IMG_SP_SNIKSNAK_DOWN
+    },
+    {
+      EL_BUG,
+      IMG_BUG_LEFT,            IMG_BUG_RIGHT,
+      IMG_BUG_UP,              IMG_BUG_DOWN
+    },
+    {
+      EL_SPACESHIP,
+      IMG_SPACESHIP_LEFT,      IMG_SPACESHIP_RIGHT,
+      IMG_SPACESHIP_UP,                IMG_SPACESHIP_DOWN
+    },
+    {
+      EL_PACMAN,
+      IMG_PACMAN_LEFT,         IMG_PACMAN_RIGHT,
+      IMG_PACMAN_UP,           IMG_PACMAN_DOWN
     },
     {
       EL_MOLE,
@@ -891,14 +890,14 @@ void InitElementInfo()
       IMG_PENGUIN_UP,          IMG_PENGUIN_DOWN
     },
     {
-      EL_SP_MURPHY,
-      IMG_SP_MURPHY_LEFT,      IMG_SP_MURPHY_RIGHT,
-      IMG_SP_MURPHY_UP,                IMG_SP_MURPHY_DOWN
+      EL_PIG,
+      IMG_PIG_LEFT,            IMG_PIG_RIGHT,
+      IMG_PIG_UP,              IMG_PIG_DOWN
     },
     {
-      EL_SP_SNIKSNAK,
-      IMG_SP_SNIKSNAK_LEFT,    IMG_SP_SNIKSNAK_RIGHT,
-      IMG_SP_SNIKSNAK_UP,      IMG_SP_SNIKSNAK_DOWN
+      EL_DRAGON,
+      IMG_DRAGON_LEFT,         IMG_DRAGON_RIGHT,
+      IMG_DRAGON_UP,           IMG_DRAGON_DOWN
     },
     {
       -1,
@@ -1104,13 +1103,13 @@ void InitElementProperties()
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
-    EL_TUBE_CROSS,
+    EL_TUBE_ALL,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERT_LEFT,
-    EL_TUBE_VERT_RIGHT,
-    EL_TUBE_HORIZ_UP,
-    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
@@ -1129,7 +1128,7 @@ void InitElementProperties()
     EL_BD_WALL,
     EL_WALL_CRUMBLED,
     EL_EXIT_CLOSED,
-    EL_AUSGANG_ACT,
+    EL_EXIT_OPENING,
     EL_EXIT_OPEN,
     EL_AMOEBA_DEAD,
     EL_AMOEBA_WET,
@@ -1146,12 +1145,12 @@ void InitElementProperties()
     EL_MAGIC_WALL_FILLING,
     EL_MAGIC_WALL_FULL,
     EL_MAGIC_WALL_DEAD,
-    EL_MAGIC_WALL_BD_OFF,
-    EL_MAGIC_WALL_BD_EMPTY,
-    EL_MAGIC_WALL_BD_EMPTYING,
-    EL_MAGIC_WALL_BD_FULL,
-    EL_MAGIC_WALL_BD_FILLING,
-    EL_MAGIC_WALL_BD_DEAD,
+    EL_BD_MAGIC_WALL,
+    EL_BD_MAGIC_WALL_EMPTY,
+    EL_BD_MAGIC_WALL_EMPTYING,
+    EL_BD_MAGIC_WALL_FULL,
+    EL_BD_MAGIC_WALL_FILLING,
+    EL_BD_MAGIC_WALL_DEAD,
     EL_GAMEOFLIFE,
     EL_BIOMAZE,
     EL_ACIDPOOL_TOPLEFT,
@@ -1196,8 +1195,8 @@ void InitElementProperties()
     EL_SWITCHGATE_SWITCH_DOWN,
     EL_LIGHT_SWITCH,
     EL_LIGHT_SWITCH_ACTIVE,
-    EL_TIMEGATE_SWITCH_OFF,
-    EL_TIMEGATE_SWITCH_ON,
+    EL_TIMEGATE_SWITCH,
+    EL_TIMEGATE_SWITCH_ACTIVE,
     EL_SIGN_EXCLAMATION,
     EL_SIGN_RADIOACTIVITY,
     EL_SIGN_STOP,
@@ -1250,13 +1249,13 @@ void InitElementProperties()
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
-    EL_TUBE_CROSS,
+    EL_TUBE_ALL,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERT_LEFT,
-    EL_TUBE_VERT_RIGHT,
-    EL_TUBE_HORIZ_UP,
-    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
@@ -1341,13 +1340,13 @@ void InitElementProperties()
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
-    EL_TUBE_CROSS,
+    EL_TUBE_ALL,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERT_LEFT,
-    EL_TUBE_VERT_RIGHT,
-    EL_TUBE_HORIZ_UP,
-    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
@@ -1396,8 +1395,8 @@ void InitElementProperties()
   {
     EL_BUG,
     EL_SPACESHIP,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
     EL_YAMYAM,
     EL_DARK_YAMYAM,
     EL_ROBOT,
@@ -1427,7 +1426,7 @@ void InitElementProperties()
     EL_EM_GATE3_GRAY,
     EL_EM_GATE4_GRAY,
     EL_EXIT_CLOSED,
-    EL_AUSGANG_ACT,
+    EL_EXIT_OPENING,
     EL_EXIT_OPEN,
     EL_WALL,
     EL_WALL_CRUMBLED,
@@ -1435,7 +1434,7 @@ void InitElementProperties()
     EL_WALL_GROWING_X,
     EL_WALL_GROWING_Y,
     EL_WALL_GROWING_XY,
-    EL_MAUERND,
+    EL_WALL_GROWING_ACTIVE,
     EL_BD_WALL,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
@@ -1489,7 +1488,7 @@ void InitElementProperties()
     EL_AMOEBA_DROP,
     EL_QUICKSAND_FULL,
     EL_MAGIC_WALL_FULL,
-    EL_MAGIC_WALL_BD_FULL,
+    EL_BD_MAGIC_WALL_FULL,
     EL_TIME_ORB_FULL,
     EL_TIME_ORB_EMPTY,
     EL_SP_ZONK,
@@ -1552,8 +1551,8 @@ void InitElementProperties()
   {
     EL_BUG,
     EL_SPACESHIP,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
     EL_YAMYAM,
     EL_DARK_YAMYAM,
     EL_ROBOT,
@@ -1580,14 +1579,14 @@ void InitElementProperties()
     EL_SPACESHIP_UP,
     EL_SPACESHIP_LEFT,
     EL_SPACESHIP_DOWN,
-    EL_BUTTERFLY_RIGHT,
-    EL_BUTTERFLY_UP,
-    EL_BUTTERFLY_LEFT,
-    EL_BUTTERFLY_DOWN,
-    EL_FIREFLY_RIGHT,
-    EL_FIREFLY_UP,
-    EL_FIREFLY_LEFT,
-    EL_FIREFLY_DOWN,
+    EL_BD_BUTTERFLY_RIGHT,
+    EL_BD_BUTTERFLY_UP,
+    EL_BD_BUTTERFLY_LEFT,
+    EL_BD_BUTTERFLY_DOWN,
+    EL_BD_FIREFLY_RIGHT,
+    EL_BD_FIREFLY_UP,
+    EL_BD_FIREFLY_LEFT,
+    EL_BD_FIREFLY_DOWN,
     EL_PACMAN_RIGHT,
     EL_PACMAN_UP,
     EL_PACMAN_LEFT,
@@ -1599,8 +1598,8 @@ void InitElementProperties()
   {
     EL_BUG,
     EL_SPACESHIP,
-    EL_BUTTERFLY,
-    EL_FIREFLY
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY
   };
   static int ep_dont_touch_num = SIZEOF_ARRAY_INT(ep_dont_touch);
 
@@ -1608,8 +1607,8 @@ void InitElementProperties()
   {
     EL_BUG,
     EL_SPACESHIP,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
     EL_YAMYAM,
     EL_DARK_YAMYAM,
     EL_ROBOT,
@@ -1618,7 +1617,7 @@ void InitElementProperties()
     EL_ACID,
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
-    EL_SP_BUG_ACTIVE,
+    EL_SP_BUGGY_BASE_ACTIVE,
     EL_TRAP_ACTIVE,
     EL_LANDMINE
   };
@@ -1629,8 +1628,8 @@ void InitElementProperties()
     EL_SAND,
     EL_BUG,
     EL_SPACESHIP,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
     EL_YAMYAM,
     EL_ROBOT,
     EL_PACMAN,
@@ -1660,21 +1659,21 @@ void InitElementProperties()
     EL_ROCK,
     EL_BD_ROCK,
     EL_BD_DIAMOND,
-    EL_MAGIC_WALL_BD_OFF,
+    EL_BD_MAGIC_WALL,
     EL_EXIT_CLOSED,
     EL_EXIT_OPEN,
     EL_STEELWALL,
     EL_PLAYER,
-    EL_FIREFLY,
-    EL_FIREFLY_1,
-    EL_FIREFLY_2,
-    EL_FIREFLY_3,
-    EL_FIREFLY_4,
-    EL_BUTTERFLY,
-    EL_BUTTERFLY_1,
-    EL_BUTTERFLY_2,
-    EL_BUTTERFLY_3,
-    EL_BUTTERFLY_4,
+    EL_BD_FIREFLY,
+    EL_BD_FIREFLY_1,
+    EL_BD_FIREFLY_2,
+    EL_BD_FIREFLY_3,
+    EL_BD_FIREFLY_4,
+    EL_BD_BUTTERFLY,
+    EL_BD_BUTTERFLY_1,
+    EL_BD_BUTTERFLY_2,
+    EL_BD_BUTTERFLY_3,
+    EL_BD_BUTTERFLY_4,
     EL_BD_AMOEBA,
     EL_CHAR_QUESTION
   };
@@ -1684,9 +1683,9 @@ void InitElementProperties()
   {
     EL_EMPTY,
     EL_STEELWALL,
-    EL_SOKOBAN_OBJEKT,
-    EL_SOKOBAN_FELD_LEER,
-    EL_SOKOBAN_FELD_VOLL,
+    EL_SOKOBAN_OBJECT,
+    EL_SOKOBAN_FIELD_EMPTY,
+    EL_SOKOBAN_FIELD_FULL,
     EL_PLAYER,
     EL_INVISIBLE_STEELWALL
   };
@@ -1710,7 +1709,6 @@ void InitElementProperties()
     EL_WALL,
     EL_BD_WALL,
     EL_WALL_CRUMBLED,
-    EL_KEY,
     EL_STEELWALL,
     EL_AMOEBA_DEAD,
     EL_QUICKSAND_EMPTY,
@@ -1751,9 +1749,9 @@ void InitElementProperties()
     EL_DYNABOMB_NR,
     EL_DYNABOMB_SZ,
     EL_DYNABOMB_XL,
-    EL_SOKOBAN_OBJEKT,
-    EL_SOKOBAN_FELD_LEER,
-    EL_SOKOBAN_FELD_VOLL,
+    EL_SOKOBAN_OBJECT,
+    EL_SOKOBAN_FIELD_EMPTY,
+    EL_SOKOBAN_FIELD_FULL,
     EL_WALL_EMERALD_RED,
     EL_WALL_EMERALD_PURPLE,
     EL_ACIDPOOL_TOPLEFT,
@@ -1763,8 +1761,8 @@ void InitElementProperties()
     EL_ACIDPOOL_BOTTOMRIGHT,
     EL_MAGIC_WALL,
     EL_MAGIC_WALL_DEAD,
-    EL_MAGIC_WALL_BD_OFF,
-    EL_MAGIC_WALL_BD_DEAD,
+    EL_BD_MAGIC_WALL,
+    EL_BD_MAGIC_WALL_DEAD,
     EL_AMOEBA_TO_DIAMOND,
     EL_BLOCKED,
     EL_SP_EMPTY,
@@ -1886,8 +1884,8 @@ void InitElementProperties()
     EL_BOMB,
     EL_NUT,
     EL_TIME_ORB_EMPTY,
-    EL_SOKOBAN_FELD_VOLL,
-    EL_SOKOBAN_OBJEKT,
+    EL_SOKOBAN_FIELD_FULL,
+    EL_SOKOBAN_OBJECT,
     EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_DISK_ORANGE,
@@ -1922,9 +1920,9 @@ void InitElementProperties()
   {
     EL_SAND,
     EL_SP_BASE,
-    EL_SP_BUG,
-    EL_TRAP_INACTIVE,
-    EL_SAND_INVISIBLE
+    EL_SP_BUGGY_BASE,
+    EL_TRAP,
+    EL_INVISIBLE_SAND
   };
   static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable);
 
@@ -1956,7 +1954,7 @@ void InitElementProperties()
     EL_SP_PORT_X,
     EL_SP_PORT_XY,
     EL_SP_ELECTRON,
-    EL_SP_BUG,
+    EL_SP_BUGGY_BASE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
     EL_SP_HARD_BASE1,
@@ -2017,13 +2015,13 @@ void InitElementProperties()
     EL_SP_PORT_X,
     EL_SP_PORT_Y,
     EL_SP_PORT_XY,
-    EL_TUBE_CROSS,
+    EL_TUBE_ALL,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERT_LEFT,
-    EL_TUBE_VERT_RIGHT,
-    EL_TUBE_HORIZ_UP,
-    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
@@ -2077,13 +2075,13 @@ void InitElementProperties()
 
   static int ep_tube[] =
   {
-    EL_TUBE_CROSS,
+    EL_TUBE_ALL,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERT_LEFT,
-    EL_TUBE_VERT_RIGHT,
-    EL_TUBE_HORIZ_UP,
-    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,