rnd-20020921-1-src
[rocksndiamonds.git] / src / init.c
index 8c391363250de573fbed086afb9b39ed25c448a5..5a643afb69d8a11befd2b3a5bbfce4b54a218b2e 100644 (file)
@@ -576,10 +576,10 @@ void InitElementInfo()
     { EL_AUSGANG_ACT,                  GFX_AUSGANG_ACT         },
     { EL_EXIT_OPEN,                    GFX_AUSGANG_AUF         },
     { EL_PLAYER,                       GFX_SPIELFIGUR          },
-    { EL_SPIELER1,                     GFX_SPIELER1            },
-    { EL_SPIELER2,                     GFX_SPIELER2            },
-    { EL_SPIELER3,                     GFX_SPIELER3            },
-    { EL_SPIELER4,                     GFX_SPIELER4            },
+    { EL_PLAYER1,                      GFX_SPIELER1            },
+    { EL_PLAYER2,                      GFX_SPIELER2            },
+    { EL_PLAYER3,                      GFX_SPIELER3            },
+    { EL_PLAYER4,                      GFX_SPIELER4            },
     { EL_BUG,                          GFX_KAEFER              },
     { EL_BUG_RIGHT,                    GFX_KAEFER_RIGHT        },
     { EL_BUG_UP,                       GFX_KAEFER_UP           },
@@ -620,13 +620,13 @@ void InitElementInfo()
     { EL_AMOEBA_DRY,                   GFX_AMOEBE_NORM         },
     { EL_AMOEBA_FULL,                  GFX_AMOEBE_VOLL         },
     { EL_BD_AMOEBA,                    GFX_AMOEBE_BD           },
-    { EL_AMOEBA2DIAM,                  GFX_AMOEBA2DIAM         },
+    { EL_AMOEBA_TO_DIAMOND,            GFX_AMOEBA2DIAM         },
     { EL_AMOEBA_DRIPPING,              GFX_AMOEBE_NASS         },
     { EL_NUT,                          GFX_KOKOSNUSS           },
     { EL_GAMEOFLIFE,                   GFX_LIFE                },
     { EL_BIOMAZE,                      GFX_LIFE_ASYNC          },
     { EL_DYNAMITE_ACTIVE,              GFX_DYNAMIT             },
-    { EL_BADEWANNE,                    GFX_BADEWANNE           },
+    { EL_STONEBLOCK,                   GFX_BADEWANNE           },
     { EL_ACIDPOOL_TOPLEFT,             GFX_BADEWANNE1          },
     { EL_ACIDPOOL_TOPRIGHT,            GFX_BADEWANNE2          },
     { EL_ACIDPOOL_BOTTOMLEFT,          GFX_BADEWANNE3          },
@@ -646,31 +646,31 @@ void InitElementInfo()
     { EL_GATE2_GRAY,                   GFX_PFORTE2X            },
     { EL_GATE3_GRAY,                   GFX_PFORTE3X            },
     { EL_GATE4_GRAY,                   GFX_PFORTE4X            },
-    { EL_DYNAMITE,             GFX_DYNAMIT_AUS         },
+    { EL_DYNAMITE,                     GFX_DYNAMIT_AUS         },
     { EL_PACMAN,                       GFX_PACMAN              },
     { EL_PACMAN_RIGHT,                 GFX_PACMAN_RIGHT        },
     { EL_PACMAN_UP,                    GFX_PACMAN_UP           },
     { EL_PACMAN_LEFT,                  GFX_PACMAN_LEFT         },
     { EL_PACMAN_DOWN,                  GFX_PACMAN_DOWN         },
-    { EL_INVISIBLE_WALL,                       GFX_UNSICHTBAR          },
+    { EL_INVISIBLE_WALL,               GFX_UNSICHTBAR          },
     { EL_WALL_EMERALD,                 GFX_ERZ_EDEL            },
     { EL_WALL_DIAMOND,                 GFX_ERZ_DIAM            },
-    { EL_LAMP,                 GFX_BIRNE_AUS           },
+    { EL_LAMP,                         GFX_BIRNE_AUS           },
     { EL_LAMP_ACTIVE,                  GFX_BIRNE_EIN           },
     { EL_TIME_ORB_FULL,                        GFX_ZEIT_VOLL           },
-    { EL_TIME_ORB_EMPTY,                       GFX_ZEIT_LEER           },
-    { EL_MAUER_LEBT,                   GFX_MAUER_LEBT          },
-    { EL_MAUER_X,                      GFX_MAUER_X             },
-    { EL_MAUER_Y,                      GFX_MAUER_Y             },
-    { EL_MAUER_XY,                     GFX_MAUER_XY            },
-    { EL_EDELSTEIN_BD,                 GFX_EDELSTEIN_BD        },
-    { EL_EDELSTEIN_YELLOW,             GFX_EDELSTEIN_GELB      },
-    { EL_EDELSTEIN_RED,                        GFX_EDELSTEIN_ROT       },
-    { EL_EDELSTEIN_PURPLE,             GFX_EDELSTEIN_LILA      },
-    { EL_WALL_BD_DIAMOND,                      GFX_ERZ_EDEL_BD         },
-    { EL_WALL_EMERALD_YELLOW,                  GFX_ERZ_EDEL_GELB       },
-    { EL_WALL_EMERALD_RED,                     GFX_ERZ_EDEL_ROT        },
-    { EL_WALL_EMERALD_PURPLE,                  GFX_ERZ_EDEL_LILA       },
+    { EL_TIME_ORB_EMPTY,               GFX_ZEIT_LEER           },
+    { EL_WALL_GROWING,                 GFX_MAUER_LEBT          },
+    { EL_WALL_GROWING_X,               GFX_MAUER_X             },
+    { EL_WALL_GROWING_Y,               GFX_MAUER_Y             },
+    { EL_WALL_GROWING_XY,              GFX_MAUER_XY            },
+    { EL_BD_DIAMOND,                   GFX_EDELSTEIN_BD        },
+    { EL_EMERALD_YELLOW,               GFX_EDELSTEIN_GELB      },
+    { EL_EMERALD_RED,                  GFX_EDELSTEIN_ROT       },
+    { EL_EMERALD_PURPLE,               GFX_EDELSTEIN_LILA      },
+    { EL_WALL_BD_DIAMOND,              GFX_ERZ_EDEL_BD         },
+    { EL_WALL_EMERALD_YELLOW,          GFX_ERZ_EDEL_GELB       },
+    { 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 },
@@ -688,36 +688,36 @@ void InitElementInfo()
     { EL_SOKOBAN_FELD_LEER,            GFX_SOKOBAN_FELD_LEER   },
     { EL_SOKOBAN_FELD_VOLL,            GFX_SOKOBAN_FELD_VOLL   },
     { EL_MOLE,                         GFX_MOLE                },
-    { EL_PINGUIN,                      GFX_PINGUIN             },
-    { EL_SCHWEIN,                      GFX_SCHWEIN             },
-    { EL_DRACHE,                       GFX_DRACHE              },
-    { EL_SONDE,                                GFX_SONDE               },
-    { EL_PFEIL_LEFT,                   GFX_PFEIL_LEFT          },
-    { EL_PFEIL_RIGHT,                  GFX_PFEIL_RIGHT         },
-    { EL_PFEIL_UP,                     GFX_PFEIL_UP            },
-    { EL_PFEIL_DOWN,                   GFX_PFEIL_DOWN          },
+    { 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_SPEED_PILL,                   GFX_SPEED_PILL          },
     { EL_SP_TERMINAL_ACTIVE,           GFX_SP_TERMINAL         },
     { EL_SP_BUG_ACTIVE,                        GFX_SP_BUG_ACTIVE       },
     { EL_SP_ZONK,                      GFX_SP_ZONK             },
-    { EL_INVISIBLE_STEEL,              GFX_INVISIBLE_STEEL     },
+    { EL_INVISIBLE_STEELWALL,          GFX_INVISIBLE_STEEL     },
     { EL_BLACK_ORB,                    GFX_BLACK_ORB           },
-    { EL_EM_GATE_1,                    GFX_EM_GATE_1           },
-    { EL_EM_GATE_2,                    GFX_EM_GATE_2           },
-    { EL_EM_GATE_3,                    GFX_EM_GATE_3           },
-    { EL_EM_GATE_4,                    GFX_EM_GATE_4           },
+    { EL_EM_GATE1,                     GFX_EM_GATE_1           },
+    { EL_EM_GATE2,                     GFX_EM_GATE_2           },
+    { EL_EM_GATE3,                     GFX_EM_GATE_3           },
+    { EL_EM_GATE4,                     GFX_EM_GATE_4           },
     { EL_EM_GATE1_GRAY,                        GFX_EM_GATE_1X          },
     { EL_EM_GATE2_GRAY,                        GFX_EM_GATE_2X          },
     { EL_EM_GATE3_GRAY,                        GFX_EM_GATE_3X          },
     { EL_EM_GATE4_GRAY,                        GFX_EM_GATE_4X          },
-    { EL_EM_KEY_1_FILE,                        GFX_EM_KEY_1            },
-    { EL_EM_KEY_2_FILE,                        GFX_EM_KEY_2            },
-    { EL_EM_KEY_3_FILE,                        GFX_EM_KEY_3            },
-    { EL_EM_KEY_4_FILE,                        GFX_EM_KEY_4            },
-    { EL_EM_KEY_1,                     GFX_EM_KEY_1            },
-    { EL_EM_KEY_2,                     GFX_EM_KEY_2            },
-    { EL_EM_KEY_3,                     GFX_EM_KEY_3            },
-    { EL_EM_KEY_4,                     GFX_EM_KEY_4            },
+    { EL_EM_KEY1_FILE,                 GFX_EM_KEY_1            },
+    { EL_EM_KEY2_FILE,                 GFX_EM_KEY_2            },
+    { EL_EM_KEY3_FILE,                 GFX_EM_KEY_3            },
+    { EL_EM_KEY4_FILE,                 GFX_EM_KEY_4            },
+    { EL_EM_KEY1,                      GFX_EM_KEY_1            },
+    { EL_EM_KEY2,                      GFX_EM_KEY_2            },
+    { EL_EM_KEY3,                      GFX_EM_KEY_3            },
+    { EL_EM_KEY4,                      GFX_EM_KEY_4            },
     { EL_PEARL,                                GFX_PEARL               },
     { EL_CRYSTAL,                      GFX_CRYSTAL             },
     { EL_WALL_PEARL,                   GFX_WALL_PEARL          },
@@ -725,41 +725,41 @@ void InitElementInfo()
     { EL_DOOR_WHITE,                   GFX_DOOR_WHITE          },
     { EL_DOOR_WHITE_GRAY,              GFX_DOOR_WHITE_GRAY     },
     { EL_KEY_WHITE,                    GFX_KEY_WHITE           },
-    { EL_SHIELD_PASSIVE,               GFX_SHIELD_PASSIVE      },
+    { EL_SHIELD_NORMAL,                        GFX_SHIELD_PASSIVE      },
     { EL_SHIELD_ACTIVE,                        GFX_SHIELD_ACTIVE       },
     { EL_EXTRA_TIME,                   GFX_EXTRA_TIME          },
     { EL_SWITCHGATE_OPEN,              GFX_SWITCHGATE_OPEN     },
     { EL_SWITCHGATE_CLOSED,            GFX_SWITCHGATE_CLOSED   },
-    { EL_SWITCHGATE_SWITCH_1,          GFX_SWITCHGATE_SWITCH_1 },
-    { EL_SWITCHGATE_SWITCH_2,          GFX_SWITCHGATE_SWITCH_2 },
-    { EL_BELT1_LEFT,                   GFX_BELT1_LEFT          },
-    { EL_BELT1_MIDDLE,                 GFX_BELT1_MIDDLE        },
-    { EL_BELT1_RIGHT,                  GFX_BELT1_RIGHT         },
-    { EL_BELT1_SWITCH_LEFT,            GFX_BELT1_SWITCH_LEFT   },
-    { EL_BELT1_SWITCH_MIDDLE,          GFX_BELT1_SWITCH_MIDDLE },
-    { EL_BELT1_SWITCH_RIGHT,           GFX_BELT1_SWITCH_RIGHT  },
-    { EL_BELT2_LEFT,                   GFX_BELT2_LEFT          },
-    { EL_BELT2_MIDDLE,                 GFX_BELT2_MIDDLE        },
-    { EL_BELT2_RIGHT,                  GFX_BELT2_RIGHT         },
-    { EL_BELT2_SWITCH_LEFT,            GFX_BELT2_SWITCH_LEFT   },
-    { EL_BELT2_SWITCH_MIDDLE,          GFX_BELT2_SWITCH_MIDDLE },
-    { EL_BELT2_SWITCH_RIGHT,           GFX_BELT2_SWITCH_RIGHT  },
-    { EL_BELT3_LEFT,                   GFX_BELT3_LEFT          },
-    { EL_BELT3_MIDDLE,                 GFX_BELT3_MIDDLE        },
-    { EL_BELT3_RIGHT,                  GFX_BELT3_RIGHT         },
-    { EL_BELT3_SWITCH_LEFT,            GFX_BELT3_SWITCH_LEFT   },
-    { EL_BELT3_SWITCH_MIDDLE,          GFX_BELT3_SWITCH_MIDDLE },
-    { EL_BELT3_SWITCH_RIGHT,           GFX_BELT3_SWITCH_RIGHT  },
-    { EL_BELT4_LEFT,                   GFX_BELT4_LEFT          },
-    { EL_BELT4_MIDDLE,                 GFX_BELT4_MIDDLE        },
-    { EL_BELT4_RIGHT,                  GFX_BELT4_RIGHT         },
-    { EL_BELT4_SWITCH_LEFT,            GFX_BELT4_SWITCH_LEFT   },
-    { EL_BELT4_SWITCH_MIDDLE,          GFX_BELT4_SWITCH_MIDDLE },
-    { EL_BELT4_SWITCH_RIGHT,           GFX_BELT4_SWITCH_RIGHT  },
+    { EL_SWITCHGATE_SWITCH_UP,         GFX_SWITCHGATE_SWITCH_1 },
+    { EL_SWITCHGATE_SWITCH_DOWN,       GFX_SWITCHGATE_SWITCH_2 },
+    { EL_CONVEYOR_BELT1_LEFT,          GFX_BELT1_LEFT          },
+    { EL_CONVEYOR_BELT1_MIDDLE,                GFX_BELT1_MIDDLE        },
+    { EL_CONVEYOR_BELT1_RIGHT,         GFX_BELT1_RIGHT         },
+    { EL_CONVEYOR_BELT1_SWITCH_LEFT,   GFX_BELT1_SWITCH_LEFT   },
+    { EL_CONVEYOR_BELT1_SWITCH_MIDDLE, GFX_BELT1_SWITCH_MIDDLE },
+    { EL_CONVEYOR_BELT1_SWITCH_RIGHT,  GFX_BELT1_SWITCH_RIGHT  },
+    { EL_CONVEYOR_BELT2_LEFT,          GFX_BELT2_LEFT          },
+    { EL_CONVEYOR_BELT2_MIDDLE,                GFX_BELT2_MIDDLE        },
+    { EL_CONVEYOR_BELT2_RIGHT,         GFX_BELT2_RIGHT         },
+    { EL_CONVEYOR_BELT2_SWITCH_LEFT,   GFX_BELT2_SWITCH_LEFT   },
+    { EL_CONVEYOR_BELT2_SWITCH_MIDDLE, GFX_BELT2_SWITCH_MIDDLE },
+    { EL_CONVEYOR_BELT2_SWITCH_RIGHT,  GFX_BELT2_SWITCH_RIGHT  },
+    { EL_CONVEYOR_BELT3_LEFT,          GFX_BELT3_LEFT          },
+    { EL_CONVEYOR_BELT3_MIDDLE,                GFX_BELT3_MIDDLE        },
+    { EL_CONVEYOR_BELT3_RIGHT,         GFX_BELT3_RIGHT         },
+    { EL_CONVEYOR_BELT3_SWITCH_LEFT,   GFX_BELT3_SWITCH_LEFT   },
+    { EL_CONVEYOR_BELT3_SWITCH_MIDDLE, GFX_BELT3_SWITCH_MIDDLE },
+    { EL_CONVEYOR_BELT3_SWITCH_RIGHT,  GFX_BELT3_SWITCH_RIGHT  },
+    { EL_CONVEYOR_BELT4_LEFT,          GFX_BELT4_LEFT          },
+    { EL_CONVEYOR_BELT4_MIDDLE,                GFX_BELT4_MIDDLE        },
+    { EL_CONVEYOR_BELT4_RIGHT,         GFX_BELT4_RIGHT         },
+    { EL_CONVEYOR_BELT4_SWITCH_LEFT,   GFX_BELT4_SWITCH_LEFT   },
+    { EL_CONVEYOR_BELT4_SWITCH_MIDDLE, GFX_BELT4_SWITCH_MIDDLE },
+    { EL_CONVEYOR_BELT4_SWITCH_RIGHT,  GFX_BELT4_SWITCH_RIGHT  },
     { EL_LANDMINE,                     GFX_LANDMINE            },
     { EL_ENVELOPE,                     GFX_ENVELOPE            },
-    { EL_LIGHT_SWITCH_OFF,             GFX_LIGHT_SWITCH_OFF    },
-    { EL_LIGHT_SWITCH_ON,              GFX_LIGHT_SWITCH_ON     },
+    { EL_LIGHT_SWITCH,                 GFX_LIGHT_SWITCH_OFF    },
+    { EL_LIGHT_SWITCH_ACTIVE,          GFX_LIGHT_SWITCH_ON     },
     { EL_SIGN_EXCLAMATION,             GFX_SIGN_EXCLAMATION    },
     { EL_SIGN_RADIOACTIVITY,           GFX_SIGN_RADIOACTIVITY  },
     { EL_SIGN_STOP,                    GFX_SIGN_STOP           },
@@ -776,7 +776,7 @@ void InitElementInfo()
     { EL_MOLE_RIGHT,                   GFX_MOLE_RIGHT          },
     { EL_MOLE_UP,                      GFX_MOLE_UP             },
     { EL_MOLE_DOWN,                    GFX_MOLE_DOWN           },
-    { EL_STEEL_SLANTED,                        GFX_STEEL_SLANTED       },
+    { EL_STEELWALL_SLANTED,            GFX_STEEL_SLANTED       },
     { EL_SAND_INVISIBLE,               GFX_SAND_INVISIBLE      },
     { EL_DX_UNKNOWN_15,                        GFX_DX_UNKNOWN_15       },
     { EL_DX_UNKNOWN_42,                        GFX_DX_UNKNOWN_42       },
@@ -790,18 +790,18 @@ void InitElementInfo()
     { 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_EMC_STEEL_WALL_1,             GFX_EMC_STEEL_WALL_1    },
-    { EL_EMC_STEEL_WALL_2,             GFX_EMC_STEEL_WALL_2    },
-    { EL_EMC_STEEL_WALL_3,             GFX_EMC_STEEL_WALL_3    },
-    { EL_EMC_STEEL_WALL_4,             GFX_EMC_STEEL_WALL_4    },
-    { EL_EMC_WALL_1,                   GFX_EMC_WALL_1          },
-    { EL_EMC_WALL_2,                   GFX_EMC_WALL_2          },
-    { EL_EMC_WALL_3,                   GFX_EMC_WALL_3          },
-    { EL_EMC_WALL_4,                   GFX_EMC_WALL_4          },
-    { EL_EMC_WALL_5,                   GFX_EMC_WALL_5          },
-    { EL_EMC_WALL_6,                   GFX_EMC_WALL_6          },
-    { EL_EMC_WALL_7,                   GFX_EMC_WALL_7          },
-    { EL_EMC_WALL_8,                   GFX_EMC_WALL_8          },
+    { EL_EMC_STEELWALL1,               GFX_EMC_STEEL_WALL_1    },
+    { EL_EMC_STEELWALL2,               GFX_EMC_STEEL_WALL_2    },
+    { EL_EMC_STEELWALL3,               GFX_EMC_STEEL_WALL_3    },
+    { EL_EMC_STEELWALL4,               GFX_EMC_STEEL_WALL_4    },
+    { EL_EMC_WALL_PILLAR_UPPER,                GFX_EMC_WALL_1          },
+    { EL_EMC_WALL_PILLAR_MIDDLE,       GFX_EMC_WALL_2          },
+    { EL_EMC_WALL_PILLAR_LOWER,                GFX_EMC_WALL_3          },
+    { EL_EMC_WALL4,                    GFX_EMC_WALL_4          },
+    { EL_EMC_WALL5,                    GFX_EMC_WALL_5          },
+    { 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_VERTICAL,                        GFX_TUBE_VERTICAL       },
     { EL_TUBE_HORIZONTAL,              GFX_TUBE_HORIZONTAL     },
@@ -850,32 +850,32 @@ void InitElementInfo()
       IMG_PACMAN_UP,           IMG_PACMAN_DOWN
     },
     {
-      EL_SPIELER1,
+      EL_PLAYER1,
       IMG_PLAYER1_LEFT,                IMG_PLAYER1_RIGHT,
       IMG_PLAYER1_UP,          IMG_PLAYER1_DOWN
     },
     {
-      EL_SPIELER2,
+      EL_PLAYER2,
       IMG_PLAYER2_LEFT,                IMG_PLAYER2_RIGHT,
       IMG_PLAYER2_UP,          IMG_PLAYER2_DOWN
     },
     {
-      EL_SPIELER3,
+      EL_PLAYER3,
       IMG_PLAYER3_LEFT,                IMG_PLAYER3_RIGHT,
       IMG_PLAYER3_UP,          IMG_PLAYER3_DOWN
     },
     {
-      EL_SPIELER4,
+      EL_PLAYER4,
       IMG_PLAYER4_LEFT,                IMG_PLAYER4_RIGHT,
       IMG_PLAYER4_UP,          IMG_PLAYER4_DOWN
     },
     {
-      EL_SCHWEIN,
+      EL_PIG,
       IMG_PIG_LEFT,            IMG_PIG_RIGHT,
       IMG_PIG_UP,              IMG_PIG_DOWN
     },
     {
-      EL_DRACHE,
+      EL_DRAGON,
       IMG_DRAGON_LEFT,         IMG_DRAGON_RIGHT,
       IMG_DRAGON_UP,           IMG_DRAGON_DOWN
     },
@@ -885,7 +885,7 @@ void InitElementInfo()
       IMG_MOLE_UP,             IMG_MOLE_DOWN
     },
     {
-      EL_PINGUIN,
+      EL_PENGUIN,
       IMG_PENGUIN_LEFT,                IMG_PENGUIN_RIGHT,
       IMG_PENGUIN_UP,          IMG_PENGUIN_DOWN
     },
@@ -1070,10 +1070,10 @@ void InitElementProperties()
     EL_KEY2,
     EL_KEY3,
     EL_KEY4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4
+    EL_EM_KEY1,
+    EL_EM_KEY2,
+    EL_EM_KEY3,
+    EL_EM_KEY4
   };
   static int ep_schluessel_num = SIZEOF_ARRAY_INT(ep_schluessel);
 
@@ -1087,14 +1087,14 @@ void InitElementProperties()
     EL_GATE2_GRAY,
     EL_GATE3_GRAY,
     EL_GATE4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1121,10 +1121,10 @@ void InitElementProperties()
   {
     EL_STEELWALL,
     EL_WALL,
-    EL_MAUER_LEBT,
-    EL_MAUER_X,
-    EL_MAUER_Y,
-    EL_MAUER_XY,
+    EL_WALL_GROWING,
+    EL_WALL_GROWING_X,
+    EL_WALL_GROWING_Y,
+    EL_WALL_GROWING_XY,
     EL_BD_WALL,
     EL_WALL_CRUMBLED,
     EL_EXIT_CLOSED,
@@ -1176,24 +1176,24 @@ void InitElementProperties()
     EL_SP_HARD_BASE6,
     EL_SP_TERMINAL,
     EL_SP_TERMINAL_ACTIVE,
-    EL_SP_EXIT,
-    EL_INVISIBLE_STEEL,
-    EL_BELT1_SWITCH_LEFT,
-    EL_BELT1_SWITCH_MIDDLE,
-    EL_BELT1_SWITCH_RIGHT,
-    EL_BELT2_SWITCH_LEFT,
-    EL_BELT2_SWITCH_MIDDLE,
-    EL_BELT2_SWITCH_RIGHT,
-    EL_BELT3_SWITCH_LEFT,
-    EL_BELT3_SWITCH_MIDDLE,
-    EL_BELT3_SWITCH_RIGHT,
-    EL_BELT4_SWITCH_LEFT,
-    EL_BELT4_SWITCH_MIDDLE,
-    EL_BELT4_SWITCH_RIGHT,
-    EL_SWITCHGATE_SWITCH_1,
-    EL_SWITCHGATE_SWITCH_2,
-    EL_LIGHT_SWITCH_OFF,
-    EL_LIGHT_SWITCH_ON,
+    EL_SP_EXIT_CLOSED,
+    EL_INVISIBLE_STEELWALL,
+    EL_CONVEYOR_BELT1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT4_SWITCH_RIGHT,
+    EL_SWITCHGATE_SWITCH_UP,
+    EL_SWITCHGATE_SWITCH_DOWN,
+    EL_LIGHT_SWITCH,
+    EL_LIGHT_SWITCH_ACTIVE,
     EL_TIMEGATE_SWITCH_OFF,
     EL_TIMEGATE_SWITCH_ON,
     EL_SIGN_EXCLAMATION,
@@ -1208,19 +1208,19 @@ void InitElementProperties()
     EL_SIGN_EXIT,
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
-    EL_STEEL_SLANTED,
-    EL_EMC_STEEL_WALL_1,
-    EL_EMC_STEEL_WALL_2,
-    EL_EMC_STEEL_WALL_3,
-    EL_EMC_STEEL_WALL_4,
-    EL_EMC_WALL_1,
-    EL_EMC_WALL_2,
-    EL_EMC_WALL_3,
-    EL_EMC_WALL_4,
-    EL_EMC_WALL_5,
-    EL_EMC_WALL_6,
-    EL_EMC_WALL_7,
-    EL_EMC_WALL_8,
+    EL_STEELWALL_SLANTED,
+    EL_EMC_STEELWALL1,
+    EL_EMC_STEELWALL2,
+    EL_EMC_STEELWALL3,
+    EL_EMC_STEELWALL4,
+    EL_EMC_WALL_PILLAR_UPPER,
+    EL_EMC_WALL_PILLAR_MIDDLE,
+    EL_EMC_WALL_PILLAR_LOWER,
+    EL_EMC_WALL4,
+    EL_EMC_WALL5,
+    EL_EMC_WALL6,
+    EL_EMC_WALL7,
+    EL_EMC_WALL8,
     EL_CRYSTAL,
     EL_WALL_PEARL,
     EL_WALL_CRYSTAL,
@@ -1232,14 +1232,14 @@ void InitElementProperties()
     EL_GATE2_GRAY,
     EL_GATE3_GRAY,
     EL_GATE4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1282,21 +1282,21 @@ void InitElementProperties()
     EL_SP_HARD_BASE4,
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
-    EL_INVISIBLE_STEEL,
-    EL_BELT1_SWITCH_LEFT,
-    EL_BELT1_SWITCH_MIDDLE,
-    EL_BELT1_SWITCH_RIGHT,
-    EL_BELT2_SWITCH_LEFT,
-    EL_BELT2_SWITCH_MIDDLE,
-    EL_BELT2_SWITCH_RIGHT,
-    EL_BELT3_SWITCH_LEFT,
-    EL_BELT3_SWITCH_MIDDLE,
-    EL_BELT3_SWITCH_RIGHT,
-    EL_BELT4_SWITCH_LEFT,
-    EL_BELT4_SWITCH_MIDDLE,
-    EL_BELT4_SWITCH_RIGHT,
-    EL_LIGHT_SWITCH_OFF,
-    EL_LIGHT_SWITCH_ON,
+    EL_INVISIBLE_STEELWALL,
+    EL_CONVEYOR_BELT1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT4_SWITCH_RIGHT,
+    EL_LIGHT_SWITCH,
+    EL_LIGHT_SWITCH_ACTIVE,
     EL_SIGN_EXCLAMATION,
     EL_SIGN_RADIOACTIVITY,
     EL_SIGN_STOP,
@@ -1309,11 +1309,11 @@ void InitElementProperties()
     EL_SIGN_EXIT,
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
-    EL_STEEL_SLANTED,
-    EL_EMC_STEEL_WALL_1,
-    EL_EMC_STEEL_WALL_2,
-    EL_EMC_STEEL_WALL_3,
-    EL_EMC_STEEL_WALL_4,
+    EL_STEELWALL_SLANTED,
+    EL_EMC_STEELWALL1,
+    EL_EMC_STEELWALL2,
+    EL_EMC_STEELWALL3,
+    EL_EMC_STEELWALL4,
     EL_CRYSTAL,
     EL_GATE1,
     EL_GATE2,
@@ -1323,14 +1323,14 @@ void InitElementProperties()
     EL_GATE2_GRAY,
     EL_GATE3_GRAY,
     EL_GATE4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1360,10 +1360,10 @@ void InitElementProperties()
     EL_ROCK,
     EL_BD_ROCK,
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_BOMB,
     EL_NUT,
@@ -1375,7 +1375,7 @@ void InitElementProperties()
     EL_LAMP,
     EL_ACIDPOOL_TOPLEFT,
     EL_ACIDPOOL_TOPRIGHT,
-    EL_SONDE,
+    EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
     EL_SP_CHIP_SINGLE,
@@ -1384,7 +1384,7 @@ void InitElementProperties()
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
     EL_SPEED_PILL,
-    EL_STEEL_SLANTED,
+    EL_STEELWALL_SLANTED,
     EL_PEARL,
     EL_CRYSTAL
   };
@@ -1416,23 +1416,23 @@ void InitElementProperties()
     EL_GATE2_GRAY,
     EL_GATE3_GRAY,
     EL_GATE4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_EXIT_CLOSED,
     EL_AUSGANG_ACT,
     EL_EXIT_OPEN,
     EL_WALL,
     EL_WALL_CRUMBLED,
-    EL_MAUER_LEBT,
-    EL_MAUER_X,
-    EL_MAUER_Y,
-    EL_MAUER_XY,
+    EL_WALL_GROWING,
+    EL_WALL_GROWING_X,
+    EL_WALL_GROWING_Y,
+    EL_WALL_GROWING_XY,
     EL_MAUERND,
     EL_BD_WALL,
     EL_SP_CHIP_SINGLE,
@@ -1453,21 +1453,21 @@ void InitElementProperties()
     EL_SP_HARD_BASE6,
     EL_SP_TERMINAL,
     EL_SP_TERMINAL_ACTIVE,
-    EL_SP_EXIT,
-    EL_INVISIBLE_STEEL,
-    EL_STEEL_SLANTED,
-    EL_EMC_STEEL_WALL_1,
-    EL_EMC_STEEL_WALL_2,
-    EL_EMC_STEEL_WALL_3,
-    EL_EMC_STEEL_WALL_4,
-    EL_EMC_WALL_1,
-    EL_EMC_WALL_2,
-    EL_EMC_WALL_3,
-    EL_EMC_WALL_4,
-    EL_EMC_WALL_5,
-    EL_EMC_WALL_6,
-    EL_EMC_WALL_7,
-    EL_EMC_WALL_8
+    EL_SP_EXIT_CLOSED,
+    EL_INVISIBLE_STEELWALL,
+    EL_STEELWALL_SLANTED,
+    EL_EMC_STEELWALL1,
+    EL_EMC_STEELWALL2,
+    EL_EMC_STEELWALL3,
+    EL_EMC_STEELWALL4,
+    EL_EMC_WALL_PILLAR_UPPER,
+    EL_EMC_WALL_PILLAR_MIDDLE,
+    EL_EMC_WALL_PILLAR_LOWER,
+    EL_EMC_WALL4,
+    EL_EMC_WALL5,
+    EL_EMC_WALL6,
+    EL_EMC_WALL7,
+    EL_EMC_WALL8
   };
   static int ep_mauer_num = SIZEOF_ARRAY_INT(ep_mauer);
 
@@ -1476,10 +1476,10 @@ void InitElementProperties()
     EL_ROCK,
     EL_BD_ROCK,
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_BOMB,
     EL_NUT,
@@ -1504,19 +1504,19 @@ void InitElementProperties()
     EL_ROCK,
     EL_BD_ROCK,
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_KEY1,
     EL_KEY2,
     EL_KEY3,
     EL_KEY4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4,
+    EL_EM_KEY1,
+    EL_EM_KEY2,
+    EL_EM_KEY3,
+    EL_EM_KEY4,
     EL_BOMB,
     EL_NUT,
     EL_AMOEBA_DROP,
@@ -1537,10 +1537,10 @@ void InitElementProperties()
     EL_ROCK,
     EL_BD_ROCK,
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND
   };
   static int ep_can_change_num = SIZEOF_ARRAY_INT(ep_can_change);
@@ -1556,10 +1556,10 @@ void InitElementProperties()
     EL_ROBOT,
     EL_PACMAN,
     EL_MOLE,
-    EL_PINGUIN,
-    EL_SCHWEIN,
-    EL_DRACHE,
-    EL_SONDE,
+    EL_PENGUIN,
+    EL_PIG,
+    EL_DRAGON,
+    EL_SATELLITE,
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
     EL_BALLOON,
@@ -1638,10 +1638,10 @@ void InitElementProperties()
     EL_AMOEBA_FULL,
     EL_BD_AMOEBA,
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_PEARL,
     EL_CRYSTAL
@@ -1656,7 +1656,7 @@ void InitElementProperties()
     EL_BD_WALL,
     EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN_BD,
+    EL_BD_DIAMOND,
     EL_MAGIC_WALL_BD_OFF,
     EL_EXIT_CLOSED,
     EL_EXIT_OPEN,
@@ -1673,7 +1673,7 @@ void InitElementProperties()
     EL_BUTTERFLY_3,
     EL_BUTTERFLY_4,
     EL_BD_AMOEBA,
-    EL_CHAR_FRAGE
+    EL_CHAR_QUESTION
   };
   static int ep_bd_element_num = SIZEOF_ARRAY_INT(ep_bd_element);
 
@@ -1685,17 +1685,17 @@ void InitElementProperties()
     EL_SOKOBAN_FELD_LEER,
     EL_SOKOBAN_FELD_VOLL,
     EL_PLAYER,
-    EL_INVISIBLE_STEEL
+    EL_INVISIBLE_STEELWALL
   };
   static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element);
 
   static int ep_gem[] =
   {
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND
   };
   static int ep_gem_num = SIZEOF_ARRAY_INT(ep_gem);
@@ -1711,16 +1711,16 @@ void InitElementProperties()
     EL_STEELWALL,
     EL_AMOEBA_DEAD,
     EL_QUICKSAND_EMPTY,
-    EL_BADEWANNE,
+    EL_STONEBLOCK,
     EL_ROBOT_WHEEL,
     EL_KEY1,
     EL_KEY2,
     EL_KEY3,
     EL_KEY4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4,
+    EL_EM_KEY1,
+    EL_EM_KEY2,
+    EL_EM_KEY3,
+    EL_EM_KEY4,
     EL_GATE1,
     EL_GATE2,
     EL_GATE3,
@@ -1729,14 +1729,14 @@ void InitElementProperties()
     EL_GATE2_GRAY,
     EL_GATE3_GRAY,
     EL_GATE4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_DYNAMITE,
     EL_INVISIBLE_WALL,
     EL_LAMP,
@@ -1762,7 +1762,7 @@ void InitElementProperties()
     EL_MAGIC_WALL_DEAD,
     EL_MAGIC_WALL_BD_OFF,
     EL_MAGIC_WALL_BD_DEAD,
-    EL_AMOEBA2DIAM,
+    EL_AMOEBA_TO_DIAMOND,
     EL_BLOCKED,
     EL_SP_EMPTY,
     EL_SP_BASE,
@@ -1795,20 +1795,20 @@ void InitElementProperties()
     EL_SP_HARD_BASE4,
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
-    EL_SP_EXIT,
-    EL_INVISIBLE_STEEL,
-    EL_BELT1_SWITCH_LEFT,
-    EL_BELT1_SWITCH_MIDDLE,
-    EL_BELT1_SWITCH_RIGHT,
-    EL_BELT2_SWITCH_LEFT,
-    EL_BELT2_SWITCH_MIDDLE,
-    EL_BELT2_SWITCH_RIGHT,
-    EL_BELT3_SWITCH_LEFT,
-    EL_BELT3_SWITCH_MIDDLE,
-    EL_BELT3_SWITCH_RIGHT,
-    EL_BELT4_SWITCH_LEFT,
-    EL_BELT4_SWITCH_MIDDLE,
-    EL_BELT4_SWITCH_RIGHT,
+    EL_SP_EXIT_CLOSED,
+    EL_INVISIBLE_STEELWALL,
+    EL_CONVEYOR_BELT1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT4_SWITCH_RIGHT,
     EL_SIGN_EXCLAMATION,
     EL_SIGN_RADIOACTIVITY,
     EL_SIGN_STOP,
@@ -1821,19 +1821,19 @@ void InitElementProperties()
     EL_SIGN_EXIT,
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
-    EL_STEEL_SLANTED,
-    EL_EMC_STEEL_WALL_1,
-    EL_EMC_STEEL_WALL_2,
-    EL_EMC_STEEL_WALL_3,
-    EL_EMC_STEEL_WALL_4,
-    EL_EMC_WALL_1,
-    EL_EMC_WALL_2,
-    EL_EMC_WALL_3,
-    EL_EMC_WALL_4,
-    EL_EMC_WALL_5,
-    EL_EMC_WALL_6,
-    EL_EMC_WALL_7,
-    EL_EMC_WALL_8
+    EL_STEELWALL_SLANTED,
+    EL_EMC_STEELWALL1,
+    EL_EMC_STEELWALL2,
+    EL_EMC_STEELWALL3,
+    EL_EMC_STEELWALL4,
+    EL_EMC_WALL_PILLAR_UPPER,
+    EL_EMC_WALL_PILLAR_MIDDLE,
+    EL_EMC_WALL_PILLAR_LOWER,
+    EL_EMC_WALL4,
+    EL_EMC_WALL5,
+    EL_EMC_WALL6,
+    EL_EMC_WALL7,
+    EL_EMC_WALL8
   };
   static int ep_inactive_num = SIZEOF_ARRAY_INT(ep_inactive);
 
@@ -1851,10 +1851,10 @@ void InitElementProperties()
     EL_DYNABOMB_XL,
     EL_BUG,
     EL_MOLE,
-    EL_PINGUIN,
-    EL_SCHWEIN,
-    EL_DRACHE,
-    EL_SONDE,
+    EL_PENGUIN,
+    EL_PIG,
+    EL_DRAGON,
+    EL_SATELLITE,
     EL_SP_DISK_RED,
     EL_SP_DISK_ORANGE,
     EL_SP_DISK_YELLOW,
@@ -1867,10 +1867,10 @@ void InitElementProperties()
   static int ep_mampf3[] =
   {
     EL_EMERALD,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_YELLOW,
-    EL_EDELSTEIN_RED,
-    EL_EDELSTEIN_PURPLE,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_PEARL,
     EL_CRYSTAL
@@ -1886,7 +1886,7 @@ void InitElementProperties()
     EL_TIME_ORB_EMPTY,
     EL_SOKOBAN_FELD_VOLL,
     EL_SOKOBAN_OBJEKT,
-    EL_SONDE,
+    EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_DISK_ORANGE,
     EL_SP_DISK_YELLOW,
@@ -1899,10 +1899,10 @@ void InitElementProperties()
   static int ep_player[] =
   {
     EL_PLAYER,
-    EL_SPIELER1,
-    EL_SPIELER2,
-    EL_SPIELER3,
-    EL_SPIELER4
+    EL_PLAYER1,
+    EL_PLAYER2,
+    EL_PLAYER3,
+    EL_PLAYER4
   };
   static int ep_player_num = SIZEOF_ARRAY_INT(ep_player);
 
@@ -1935,7 +1935,7 @@ void InitElementProperties()
     EL_SP_INFOTRON,
     EL_SP_CHIP_SINGLE,
     EL_SP_HARD_GRAY,
-    EL_SP_EXIT,
+    EL_SP_EXIT_CLOSED,
     EL_SP_DISK_ORANGE,
     EL_SP_PORT1_RIGHT,
     EL_SP_PORT1_DOWN,
@@ -1977,14 +1977,14 @@ void InitElementProperties()
 
   static int ep_quick_gate[] =
   {
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
+    EL_EM_GATE1,
+    EL_EM_GATE2,
+    EL_EM_GATE3,
+    EL_EM_GATE4,
+    EL_EM_GATE1_GRAY,
+    EL_EM_GATE2_GRAY,
+    EL_EM_GATE3_GRAY,
+    EL_EM_GATE4_GRAY,
     EL_SP_PORT1_LEFT,
     EL_SP_PORT2_LEFT,
     EL_SP_PORT1_RIGHT,
@@ -2040,35 +2040,35 @@ void InitElementProperties()
 
   static int ep_belt[] =
   {
-    EL_BELT1_LEFT,
-    EL_BELT1_MIDDLE,
-    EL_BELT1_RIGHT,
-    EL_BELT2_LEFT,
-    EL_BELT2_MIDDLE,
-    EL_BELT2_RIGHT,
-    EL_BELT3_LEFT,
-    EL_BELT3_MIDDLE,
-    EL_BELT3_RIGHT,
-    EL_BELT4_LEFT,
-    EL_BELT4_MIDDLE,
-    EL_BELT4_RIGHT,
+    EL_CONVEYOR_BELT1_LEFT,
+    EL_CONVEYOR_BELT1_MIDDLE,
+    EL_CONVEYOR_BELT1_RIGHT,
+    EL_CONVEYOR_BELT2_LEFT,
+    EL_CONVEYOR_BELT2_MIDDLE,
+    EL_CONVEYOR_BELT2_RIGHT,
+    EL_CONVEYOR_BELT3_LEFT,
+    EL_CONVEYOR_BELT3_MIDDLE,
+    EL_CONVEYOR_BELT3_RIGHT,
+    EL_CONVEYOR_BELT4_LEFT,
+    EL_CONVEYOR_BELT4_MIDDLE,
+    EL_CONVEYOR_BELT4_RIGHT,
   };
   static int ep_belt_num = SIZEOF_ARRAY_INT(ep_belt);
 
   static int ep_belt_switch[] =
   {
-    EL_BELT1_SWITCH_LEFT,
-    EL_BELT1_SWITCH_MIDDLE,
-    EL_BELT1_SWITCH_RIGHT,
-    EL_BELT2_SWITCH_LEFT,
-    EL_BELT2_SWITCH_MIDDLE,
-    EL_BELT2_SWITCH_RIGHT,
-    EL_BELT3_SWITCH_LEFT,
-    EL_BELT3_SWITCH_MIDDLE,
-    EL_BELT3_SWITCH_RIGHT,
-    EL_BELT4_SWITCH_LEFT,
-    EL_BELT4_SWITCH_MIDDLE,
-    EL_BELT4_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT4_SWITCH_RIGHT,
   };
   static int ep_belt_switch_num = SIZEOF_ARRAY_INT(ep_belt_switch);