rnd-20021006-1-src
[rocksndiamonds.git] / src / init.c
index 8f957e30837f16165db67f41dee238b7f5fcc3ca..32b2cb8e3d6504c2f426e26ba65b554695b3c855 100644 (file)
 #include "cartoons.h"
 #include "config.h"
 
+#include "conf_e2g.c"  /* include auto-generated data structure definitions */
+
+
 static char *image_filename[NUM_PICTURES] =
 {
   "RocksScreen.pcx",
+  "RocksElements.pcx",
   "RocksDoor.pcx",
   "RocksHeroes.pcx",
   "RocksToons.pcx",
   "RocksSP.pcx",
   "RocksDC.pcx",
   "RocksMore.pcx",
-  "RocksFont.pcx",
-  "RocksFont2.pcx",
-  "RocksFont3.pcx"
+  "RocksFontBig.pcx",
+  "RocksFontSmall.pcx",
+  "RocksFontMedium.pcx",
+  "RocksFontEM.pcx"
 }; 
 
 static void InitSetup(void);
@@ -55,6 +60,7 @@ static void InitGadgets(void);
 static void InitElementProperties(void);
 static void InitElementInfo(void);
 static void InitGraphicInfo(void);
+static void InitSoundInfo();
 static void Execute_Debug_Command(char *);
 
 void OpenAll(void)
@@ -100,7 +106,6 @@ void OpenAll(void)
   InitGfx();
   InitElementProperties();     /* initializes IS_CHAR() for el2gfx() */
   InitElementInfo();
-  InitGraphicInfo();
 
   InitLevelInfo();
   InitLevelArtworkInfo();
@@ -176,16 +181,19 @@ void InitNetworkServer()
 
 static void InitImages()
 {
-  InitImageList(image_config, NUM_IMAGE_CONFIG_ENTRIES);
+  InitImageList(image_config, image_config_suffix, NUM_IMAGE_FILES);
 
   /* load custom images */
   ReloadCustomImages();
+
+  InitGraphicInfo();
 }
 
 static void InitMixer()
 {
   OpenAudio();
-  InitSoundList(sound_config, NUM_SOUND_CONFIG_ENTRIES);
+
+  InitSoundList(sound_config, sound_config_suffix, NUM_SOUND_FILES);
 
   StartMixer();
 }
@@ -196,8 +204,7 @@ static void InitSound()
   InitReloadSounds(artwork.snd_current->identifier);
   InitReloadMusic(artwork.mus_current->identifier);
 
-  /* initialize sound effect lookup table for element actions */
-  InitGameSound();
+  InitSoundInfo();
 }
 
 static void InitTileClipmasks()
@@ -379,9 +386,9 @@ void InitGfx()
   pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
   pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
 
-  pix[PIX_SMALLFONT] = LoadCustomImage(image_filename[PIX_SMALLFONT]);
+  pix[PIX_FONT_SMALL] = LoadCustomImage(image_filename[PIX_FONT_SMALL]);
 
-  InitFontInfo(NULL, NULL, pix[PIX_SMALLFONT]);
+  InitFontInfo(NULL, NULL, pix[PIX_FONT_SMALL], NULL);
 
   DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
   DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
@@ -390,7 +397,7 @@ void InitGfx()
 
   for(i=0; i<NUM_PICTURES; i++)
   {
-    if (i != PIX_SMALLFONT)
+    if (i != PIX_FONT_SMALL)
     {
       DrawInitText(image_filename[i], 150, FC_YELLOW);
 
@@ -398,7 +405,8 @@ void InitGfx()
     }
   }
 
-  InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]);
+  InitFontInfo(pix[PIX_FONT_BIG], pix[PIX_FONT_MEDIUM], pix[PIX_FONT_SMALL],
+              pix[PIX_FONT_EM]);
 
   InitTileClipmasks();
 }
@@ -497,6 +505,7 @@ void ReloadCustomArtwork()
     }
 
     ReloadCustomImages();
+    InitGraphicInfo();
 
     FreeTileClipmasks();
     InitTileClipmasks();
@@ -550,8 +559,7 @@ void InitGadgets()
 
 void InitElementInfo()
 {
-  int i;
-
+#if 0
   static struct
   {
     int element;
@@ -559,159 +567,160 @@ void InitElementInfo()
   }
   element_to_graphic[] =
   {
-    { EL_LEERRAUM,                     GFX_LEERRAUM            },
-    { EL_ERDREICH,                     GFX_ERDREICH            },
-    { EL_MAUERWERK,                    GFX_MAUERWERK           },
-    { EL_FELSBODEN,                    GFX_FELSBODEN           },
-    { EL_FELSBROCKEN,                  GFX_FELSBROCKEN         },
-    { EL_SCHLUESSEL,                   GFX_SCHLUESSEL          },
-    { EL_EDELSTEIN,                    GFX_EDELSTEIN           },
-    { EL_AUSGANG_ZU,                   GFX_AUSGANG_ZU          },
-    { EL_AUSGANG_ACT,                  GFX_AUSGANG_ACT         },
-    { EL_AUSGANG_AUF,                  GFX_AUSGANG_AUF         },
-    { EL_SPIELFIGUR,                   GFX_SPIELFIGUR          },
-    { EL_SPIELER1,                     GFX_SPIELER1            },
-    { EL_SPIELER2,                     GFX_SPIELER2            },
-    { EL_SPIELER3,                     GFX_SPIELER3            },
-    { EL_SPIELER4,                     GFX_SPIELER4            },
-    { EL_KAEFER,                       GFX_KAEFER              },
-    { EL_KAEFER_RIGHT,                 GFX_KAEFER_RIGHT        },
-    { EL_KAEFER_UP,                    GFX_KAEFER_UP           },
-    { EL_KAEFER_LEFT,                  GFX_KAEFER_LEFT         },
-    { EL_KAEFER_DOWN,                  GFX_KAEFER_DOWN         },
-    { EL_FLIEGER,                      GFX_FLIEGER             },
-    { EL_FLIEGER_RIGHT,                        GFX_FLIEGER_RIGHT       },
-    { EL_FLIEGER_UP,                   GFX_FLIEGER_UP          },
-    { EL_FLIEGER_LEFT,                 GFX_FLIEGER_LEFT        },
-    { EL_FLIEGER_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_MAMPFER,                      GFX_MAMPFER             },
+    { EL_EMPTY,                                GFX_LEERRAUM            },
+    { EL_SAND,                         GFX_ERDREICH            },
+    { EL_WALL,                         GFX_MAUERWERK           },
+    { EL_WALL_CRUMBLED,                        GFX_FELSBODEN           },
+    { EL_ROCK,                         GFX_FELSBROCKEN         },
+    { EL_EMERALD,                      GFX_EDELSTEIN           },
+    { EL_EXIT_CLOSED,                  GFX_AUSGANG_ZU          },
+    { EL_EXIT_OPENING,                 GFX_AUSGANG_ACT         },
+    { EL_EXIT_OPEN,                    GFX_AUSGANG_AUF         },
+    { EL_SP_EXIT_OPEN,                 GFX_SP_EXIT             },
+    { 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           },
+    { EL_BUG_LEFT,                     GFX_KAEFER_LEFT         },
+    { EL_BUG_DOWN,                     GFX_KAEFER_DOWN         },
+    { EL_SPACESHIP,                    GFX_FLIEGER             },
+    { EL_SPACESHIP_RIGHT,              GFX_FLIEGER_RIGHT       },
+    { EL_SPACESHIP_UP,                 GFX_FLIEGER_UP          },
+    { EL_SPACESHIP_LEFT,               GFX_FLIEGER_LEFT        },
+    { EL_SPACESHIP_DOWN,               GFX_FLIEGER_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_BETON,                                GFX_BETON               },
-    { EL_DIAMANT,                      GFX_DIAMANT             },
-    { EL_MORAST_LEER,                  GFX_MORAST_LEER         },
-    { EL_MORAST_VOLL,                  GFX_MORAST_VOLL         },
+    { EL_STEELWALL,                    GFX_BETON               },
+    { EL_DIAMOND,                      GFX_DIAMANT             },
+    { EL_QUICKSAND_EMPTY,              GFX_MORAST_LEER         },
+    { EL_QUICKSAND_FULL,               GFX_MORAST_VOLL         },
     { EL_QUICKSAND_EMPTYING,           GFX_MORAST_LEER         },
-    { EL_TROPFEN,                      GFX_TROPFEN             },
-    { EL_BOMBE,                                GFX_BOMBE               },
-    { EL_MAGIC_WALL_OFF,               GFX_MAGIC_WALL_OFF      },
-    { EL_MAGIC_WALL_EMPTY,             GFX_MAGIC_WALL_EMPTY    },
+    { EL_AMOEBA_DROP,                  GFX_TROPFEN             },
+    { EL_BOMB,                         GFX_BOMBE               },
+    { EL_MAGIC_WALL,                   GFX_MAGIC_WALL_OFF      },
+    { EL_MAGIC_WALL_ACTIVE,            GFX_MAGIC_WALL_EMPTY    },
     { EL_MAGIC_WALL_EMPTYING,          GFX_MAGIC_WALL_EMPTY    },
     { EL_MAGIC_WALL_FULL,              GFX_MAGIC_WALL_FULL     },
     { EL_MAGIC_WALL_DEAD,              GFX_MAGIC_WALL_DEAD     },
-    { EL_SALZSAEURE,                   GFX_SALZSAEURE          },
-    { EL_AMOEBE_TOT,                   GFX_AMOEBE_TOT          },
-    { EL_AMOEBE_NASS,                  GFX_AMOEBE_NASS         },
-    { EL_AMOEBE_NORM,                  GFX_AMOEBE_NORM         },
-    { EL_AMOEBE_VOLL,                  GFX_AMOEBE_VOLL         },
-    { EL_AMOEBE_BD,                    GFX_AMOEBE_BD           },
-    { EL_AMOEBA2DIAM,                  GFX_AMOEBA2DIAM         },
+    { EL_ACID,                         GFX_SALZSAEURE          },
+    { EL_AMOEBA_DEAD,                  GFX_AMOEBE_TOT          },
+    { EL_AMOEBA_WET,                   GFX_AMOEBE_NASS         },
+    { EL_AMOEBA_DRY,                   GFX_AMOEBE_NORM         },
+    { EL_AMOEBA_FULL,                  GFX_AMOEBE_VOLL         },
+    { EL_BD_AMOEBA,                    GFX_AMOEBE_BD           },
+    { EL_AMOEBA_TO_DIAMOND,            GFX_AMOEBA2DIAM         },
     { EL_AMOEBA_DRIPPING,              GFX_AMOEBE_NASS         },
-    { EL_KOKOSNUSS,                    GFX_KOKOSNUSS           },
-    { EL_LIFE,                         GFX_LIFE                },
-    { EL_LIFE_ASYNC,                   GFX_LIFE_ASYNC          },
+    { EL_NUT,                          GFX_KOKOSNUSS           },
+    { EL_GAMEOFLIFE,                   GFX_LIFE                },
+    { EL_BIOMAZE,                      GFX_LIFE_ASYNC          },
     { EL_DYNAMITE_ACTIVE,              GFX_DYNAMIT             },
-    { EL_BADEWANNE,                    GFX_BADEWANNE           },
-    { EL_BADEWANNE1,                   GFX_BADEWANNE1          },
-    { EL_BADEWANNE2,                   GFX_BADEWANNE2          },
-    { EL_BADEWANNE3,                   GFX_BADEWANNE3          },
-    { EL_BADEWANNE4,                   GFX_BADEWANNE4          },
-    { EL_BADEWANNE5,                   GFX_BADEWANNE5          },
-    { EL_ABLENK_AUS,                   GFX_ABLENK_AUS          },
-    { EL_ABLENK_EIN,                   GFX_ABLENK_EIN          },
-    { EL_SCHLUESSEL1,                  GFX_SCHLUESSEL1         },
-    { EL_SCHLUESSEL2,                  GFX_SCHLUESSEL2         },
-    { EL_SCHLUESSEL3,                  GFX_SCHLUESSEL3         },
-    { EL_SCHLUESSEL4,                  GFX_SCHLUESSEL4         },
-    { EL_PFORTE1,                      GFX_PFORTE1             },
-    { EL_PFORTE2,                      GFX_PFORTE2             },
-    { EL_PFORTE3,                      GFX_PFORTE3             },
-    { EL_PFORTE4,                      GFX_PFORTE4             },
-    { EL_PFORTE1X,                     GFX_PFORTE1X            },
-    { EL_PFORTE2X,                     GFX_PFORTE2X            },
-    { EL_PFORTE3X,                     GFX_PFORTE3X            },
-    { EL_PFORTE4X,                     GFX_PFORTE4X            },
-    { EL_DYNAMITE_INACTIVE,            GFX_DYNAMIT_AUS         },
+    { EL_STONEBLOCK,                   GFX_BADEWANNE           },
+    { EL_ACIDPOOL_TOPLEFT,             GFX_BADEWANNE1          },
+    { EL_ACIDPOOL_TOPRIGHT,            GFX_BADEWANNE2          },
+    { EL_ACIDPOOL_BOTTOMLEFT,          GFX_BADEWANNE3          },
+    { EL_ACIDPOOL_BOTTOM,              GFX_BADEWANNE4          },
+    { EL_ACIDPOOL_BOTTOMRIGHT,         GFX_BADEWANNE5          },
+    { EL_ROBOT_WHEEL,                  GFX_ABLENK_AUS          },
+    { EL_ROBOT_WHEEL_ACTIVE,           GFX_ABLENK_EIN          },
+    { EL_KEY1,                         GFX_SCHLUESSEL1         },
+    { EL_KEY2,                         GFX_SCHLUESSEL2         },
+    { EL_KEY3,                         GFX_SCHLUESSEL3         },
+    { EL_KEY4,                         GFX_SCHLUESSEL4         },
+    { EL_GATE1,                                GFX_PFORTE1             },
+    { EL_GATE2,                                GFX_PFORTE2             },
+    { EL_GATE3,                                GFX_PFORTE3             },
+    { EL_GATE4,                                GFX_PFORTE4             },
+    { EL_GATE1_GRAY,                   GFX_PFORTE1X            },
+    { EL_GATE2_GRAY,                   GFX_PFORTE2X            },
+    { EL_GATE3_GRAY,                   GFX_PFORTE3X            },
+    { EL_GATE4_GRAY,                   GFX_PFORTE4X            },
+    { 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_UNSICHTBAR,                   GFX_UNSICHTBAR          },
-    { EL_ERZ_EDEL,                     GFX_ERZ_EDEL            },
-    { EL_ERZ_DIAM,                     GFX_ERZ_DIAM            },
-    { EL_BIRNE_AUS,                    GFX_BIRNE_AUS           },
-    { EL_BIRNE_EIN,                    GFX_BIRNE_EIN           },
-    { EL_ZEIT_VOLL,                    GFX_ZEIT_VOLL           },
-    { EL_ZEIT_LEER,                    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_GELB,               GFX_EDELSTEIN_GELB      },
-    { EL_EDELSTEIN_ROT,                        GFX_EDELSTEIN_ROT       },
-    { EL_EDELSTEIN_LILA,               GFX_EDELSTEIN_LILA      },
-    { EL_ERZ_EDEL_BD,                  GFX_ERZ_EDEL_BD         },
-    { EL_ERZ_EDEL_GELB,                        GFX_ERZ_EDEL_GELB       },
-    { EL_ERZ_EDEL_ROT,                 GFX_ERZ_EDEL_ROT        },
-    { EL_ERZ_EDEL_LILA,                        GFX_ERZ_EDEL_LILA       },
-    { EL_MAMPFER2,                     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_DYNABOMB_ACTIVE_1,            GFX_DYNABOMB            },
-    { EL_DYNABOMB_ACTIVE_2,            GFX_DYNABOMB            },
-    { EL_DYNABOMB_ACTIVE_3,            GFX_DYNABOMB            },
-    { EL_DYNABOMB_ACTIVE_4,            GFX_DYNABOMB            },
+    { EL_INVISIBLE_WALL,               GFX_UNSICHTBAR          },
+    { EL_INVISIBLE_WALL_ACTIVE,                GFX_UNSICHTBAR_ON       },
+    { EL_WALL_EMERALD,                 GFX_ERZ_EDEL            },
+    { EL_WALL_DIAMOND,                 GFX_ERZ_DIAM            },
+    { 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_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_BD_MAGIC_WALL,                        GFX_MAGIC_WALL_BD_OFF   },
+    { EL_BD_MAGIC_WALL_ACTIVE,         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_PLAYER1_ACTIVE,      GFX_DYNABOMB            },
+    { EL_DYNABOMB_PLAYER2_ACTIVE,      GFX_DYNABOMB            },
+    { EL_DYNABOMB_PLAYER3_ACTIVE,      GFX_DYNABOMB            },
+    { EL_DYNABOMB_PLAYER4_ACTIVE,      GFX_DYNABOMB            },
     { 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_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_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_STEEL,              GFX_INVISIBLE_STEEL     },
+    { EL_INVISIBLE_STEELWALL,          GFX_INVISIBLE_STEEL     },
+    { EL_INVISIBLE_STEELWALL_ACTIVE,   GFX_INVISIBLE_STEEL_ON  },
     { 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_GATE_1X,                   GFX_EM_GATE_1X          },
-    { EL_EM_GATE_2X,                   GFX_EM_GATE_2X          },
-    { EL_EM_GATE_3X,                   GFX_EM_GATE_3X          },
-    { EL_EM_GATE_4X,                   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_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_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          },
@@ -719,41 +728,53 @@ 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_ACTIVE,                        GFX_SHIELD_ACTIVE       },
+    { EL_SHIELD_NORMAL,                        GFX_SHIELD_PASSIVE      },
+    { EL_SHIELD_DEADLY,                        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_LEFT_ACTIVE,   GFX_BELT1_LEFT          },
+    { EL_CONVEYOR_BELT1_MIDDLE_ACTIVE, GFX_BELT1_MIDDLE        },
+    { EL_CONVEYOR_BELT1_RIGHT_ACTIVE,  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_LEFT_ACTIVE,   GFX_BELT2_LEFT          },
+    { EL_CONVEYOR_BELT2_MIDDLE_ACTIVE, GFX_BELT2_MIDDLE        },
+    { EL_CONVEYOR_BELT2_RIGHT_ACTIVE,  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_LEFT_ACTIVE,   GFX_BELT3_LEFT          },
+    { EL_CONVEYOR_BELT3_MIDDLE_ACTIVE, GFX_BELT3_MIDDLE        },
+    { EL_CONVEYOR_BELT3_RIGHT_ACTIVE,  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_LEFT_ACTIVE,   GFX_BELT4_LEFT          },
+    { EL_CONVEYOR_BELT4_MIDDLE_ACTIVE, GFX_BELT4_MIDDLE        },
+    { EL_CONVEYOR_BELT4_RIGHT_ACTIVE,  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           },
@@ -770,46 +791,47 @@ 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_SAND_INVISIBLE,               GFX_SAND_INVISIBLE      },
+    { EL_STEELWALL_SLANTED,            GFX_STEEL_SLANTED       },
+    { EL_INVISIBLE_SAND,               GFX_SAND_INVISIBLE      },
+    { EL_INVISIBLE_SAND_ACTIVE,                GFX_SAND_INVISIBLE_ON   },
     { 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_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_TUBE_CROSS,                   GFX_TUBE_CROSS          },
+    { 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    },
+    { 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_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             },
@@ -818,13 +840,114 @@ void InitElementInfo()
     { -1,                              -1                      }
   };
 
-  /* always start with reliable default values */
+  static struct
+  {
+    int element;
+    int graphic_left;
+    int graphic_right;
+    int graphic_up;
+    int graphic_down;
+  }
+  element_to_direction_graphic[] =
+  {
+    {
+      EL_PLAYER1,
+      IMG_PLAYER1_LEFT,                IMG_PLAYER1_RIGHT,
+      IMG_PLAYER1_UP,          IMG_PLAYER1_DOWN
+    },
+    {
+      EL_PLAYER2,
+      IMG_PLAYER2_LEFT,                IMG_PLAYER2_RIGHT,
+      IMG_PLAYER2_UP,          IMG_PLAYER2_DOWN
+    },
+    {
+      EL_PLAYER3,
+      IMG_PLAYER3_LEFT,                IMG_PLAYER3_RIGHT,
+      IMG_PLAYER3_UP,          IMG_PLAYER3_DOWN
+    },
+    {
+      EL_PLAYER4,
+      IMG_PLAYER4_LEFT,                IMG_PLAYER4_RIGHT,
+      IMG_PLAYER4_UP,          IMG_PLAYER4_DOWN
+    },
+    {
+      EL_SP_MURPHY,
+      IMG_SP_MURPHY_LEFT,      IMG_SP_MURPHY_RIGHT,
+      IMG_SP_MURPHY_UP,                IMG_SP_MURPHY_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,
+      IMG_MOLE_LEFT,           IMG_MOLE_RIGHT,
+      IMG_MOLE_UP,             IMG_MOLE_DOWN
+    },
+    {
+      EL_PENGUIN,
+      IMG_PENGUIN_LEFT,                IMG_PENGUIN_RIGHT,
+      IMG_PENGUIN_UP,          IMG_PENGUIN_DOWN
+    },
+    {
+      EL_PIG,
+      IMG_PIG_LEFT,            IMG_PIG_RIGHT,
+      IMG_PIG_UP,              IMG_PIG_DOWN
+    },
+    {
+      EL_DRAGON,
+      IMG_DRAGON_LEFT,         IMG_DRAGON_RIGHT,
+      IMG_DRAGON_UP,           IMG_DRAGON_DOWN
+    },
+    {
+      -1,
+      -1,                      -1,
+      -1,                      -1
+    }
+  };
+#endif
+
+  int i, act, dir;
+
+  /* set values to -1 to identify later as "uninitialized" values */
   for(i=0; i<MAX_ELEMENTS; i++)
-    element_info[i].graphic = GFX_LEERRAUM;
+  {
+    for(act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
+    {
+      element_info[i].graphic[act] = -1;
+
+      for(dir=0; dir<NUM_MV_DIRECTIONS; dir++)
+       element_info[i].direction_graphic[act][dir] = -1;
+    }
+  }
 
+#if 0
+  for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
+    element_info[i].graphic[GFX_ACTION_DEFAULT] =
+      GFX_CHAR_START + (i - EL_CHAR_START);
+#else
   for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
-    element_info[i].graphic = GFX_CHAR_START + (i - EL_CHAR_START);
+    element_info[i].graphic[GFX_ACTION_DEFAULT] =
+      IMG_CHAR_START + (i - EL_CHAR_START);
+#endif
 
+#if 0
   for (i=EL_SP_START; i<=EL_SP_END; i++)
   {
     int nr_element = i - EL_SP_START;
@@ -833,9 +956,12 @@ void InitElementInfo()
       (nr_element / gfx_per_line) * SP_PER_LINE +
       (nr_element % gfx_per_line);
 
-    element_info[i].graphic = GFX_START_ROCKSSP + nr_graphic;
+    element_info[i].graphic[GFX_ACTION_DEFAULT] =
+      GFX_START_ROCKSSP + nr_graphic;
   }
+#endif
 
+#if 0
   /* this overrides some of the above default settings (GFX_SP_ZONK etc.) */
   i = 0;
   while (element_to_graphic[i].element > -1)
@@ -843,29 +969,186 @@ void InitElementInfo()
     int element = element_to_graphic[i].element;
     int graphic = element_to_graphic[i].graphic;
 
-    element_info[element].graphic = graphic;
+    element_info[element].graphic[GFX_ACTION_DEFAULT] = graphic;
     i++;
   }
+
+  /* this initializes special graphics for left/right/up/down directions */
+  i = 0;
+  while (element_to_direction_graphic[i].element > -1)
+  {
+    int element = element_to_direction_graphic[i].element;
+
+    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_LEFT] =
+      element_to_direction_graphic[i].graphic_left;
+    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_RIGHT] =
+      element_to_direction_graphic[i].graphic_right;
+    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_UP] =
+      element_to_direction_graphic[i].graphic_up;
+    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_DOWN] =
+      element_to_direction_graphic[i].graphic_down;
+
+    element_info[element].has_direction_graphic[GFX_ACTION_DEFAULT] = TRUE;
+    i++;
+  }
+#else
+
+  i = 0;
+  while (element_to_graphic[i].element > -1)
+  {
+    int element   = element_to_graphic[i].element;
+    int direction = element_to_graphic[i].direction;
+    int action    = element_to_graphic[i].action;
+    int graphic   = element_to_graphic[i].graphic;
+
+    if (action > -1)
+      action = graphics_action_mapping[action];
+    else
+      action = GFX_ACTION_DEFAULT;
+
+    if (direction > -1)
+    {
+      direction = MV_DIR_BIT(direction);
+
+      element_info[element].direction_graphic[action][direction] = graphic;
+    }
+    else
+      element_info[element].graphic[action] = graphic;
+
+    i++;
+  }
+
+  /* now set all '-1' values to element specific default values */
+  for(i=0; i<MAX_ELEMENTS; i++)
+  {
+    int default_action_graphic = element_info[i].graphic[GFX_ACTION_DEFAULT];
+    int default_action_direction_graphic[NUM_MV_DIRECTIONS];
+
+    if (default_action_graphic == -1)
+      default_action_graphic = IMG_CHAR_QUESTION;
+
+    for(dir=0; dir<NUM_MV_DIRECTIONS; dir++)
+    {
+      default_action_direction_graphic[dir] =
+       element_info[i].direction_graphic[GFX_ACTION_DEFAULT][dir];
+
+      if (default_action_direction_graphic[dir] == -1)
+       default_action_direction_graphic[dir] = default_action_graphic;
+    }
+
+    for(act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
+    {
+      for(dir=0; dir<NUM_MV_DIRECTIONS; dir++)
+      {
+       int default_direction_graphic = element_info[i].graphic[act];
+
+       /* no graphic for current action -- use default direction graphic */
+       if (default_direction_graphic == -1)
+         default_direction_graphic = default_action_direction_graphic[dir];
+
+       if (element_info[i].direction_graphic[act][dir] == -1)
+         element_info[i].direction_graphic[act][dir] =
+           default_direction_graphic;
+      }
+
+      /* no graphic for this specific action -- use default action graphic */
+      if (element_info[i].graphic[act] == -1)
+       element_info[i].graphic[act] = default_action_graphic;
+    }
+  }
+
+#endif
 }
 
-void InitGraphicInfo()
+static void InitGraphicInfo()
 {
   int i;
 
-  /* always start with reliable default values */
+  image_files = getCurrentImageList();
+
   for(i=0; i<MAX_GRAPHICS; i++)
   {
-    graphic_info[i].bitmap = pix[PIX_SP];      /* graphic that ... */
-    graphic_info[i].src_x = 0;                 /* ... contains ... */
-    graphic_info[i].src_y = 0;                 /* ... empty space. */
-    graphic_info[i].anim_frames = 1;
-    graphic_info[i].anim_delay = 0;
-    graphic_info[i].anim_mode = ANIM_NORMAL;
-  }
+    /* always start with reliable default values */
+    graphic_info[i].bitmap = NULL;
+    graphic_info[i].src_x = 0;
+    graphic_info[i].src_y = 0;
 
-  for(i=0; i<MAX_GRAPHICS; i++)
     getGraphicSource(i, &graphic_info[i].bitmap,
                     &graphic_info[i].src_x, &graphic_info[i].src_y);
+  }
+
+  for(i=0; i<NUM_IMAGE_FILES; i++)
+  {
+    int *parameter = image_files[i].parameter;
+
+    new_graphic_info[i].bitmap = getBitmapFromImageID(i);
+
+    new_graphic_info[i].src_x = parameter[GFX_ARG_XPOS] * TILEX;
+    new_graphic_info[i].src_y = parameter[GFX_ARG_YPOS] * TILEY;
+    new_graphic_info[i].offset_x = parameter[GFX_ARG_OFFSET];
+    new_graphic_info[i].offset_y = 0;
+
+    /* animation frames are ordered vertically instead of horizontally */
+    if (parameter[GFX_ARG_VERTICAL])
+    {
+      new_graphic_info[i].offset_x = 0;
+      new_graphic_info[i].offset_y = parameter[GFX_ARG_OFFSET];
+    }
+
+    new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
+
+    new_graphic_info[i].anim_delay = parameter[GFX_ARG_DELAY];
+    if (new_graphic_info[i].anim_delay == 0)   /* delay must be at least 1 */
+      new_graphic_info[i].anim_delay = 1;
+
+    /* set mode for animation frame order */
+    if (parameter[GFX_ARG_MODE_LOOP])
+      new_graphic_info[i].anim_mode = ANIM_LOOP;
+    else if (parameter[GFX_ARG_MODE_LINEAR])
+      new_graphic_info[i].anim_mode = ANIM_LINEAR;
+    else if (parameter[GFX_ARG_MODE_PINGPONG])
+      new_graphic_info[i].anim_mode = ANIM_PINGPONG;
+    else if (parameter[GFX_ARG_MODE_PINGPONG2])
+      new_graphic_info[i].anim_mode = ANIM_PINGPONG2;
+    else if (parameter[GFX_ARG_FRAMES] > 1)
+      new_graphic_info[i].anim_mode = ANIM_LOOP;
+    else
+      new_graphic_info[i].anim_mode = ANIM_NONE;
+
+    /* set additional flag to play animation frames in reverse order */
+    if (parameter[GFX_ARG_MODE_REVERSE])
+      new_graphic_info[i].anim_mode |= ANIM_REVERSE;
+
+    /* animation synchronized with global frame counter, not move position */
+    new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
+  }
+
+#if 0
+  printf("D> %d\n", image_files[GFX_BD_DIAMOND].parameter[GFX_ARG_NUM_FRAMES]);
+  printf("W> %d\n", image_files[GFX_ROBOT_WHEEL].parameter[GFX_ARG_NUM_FRAMES]);
+
+  graphic_info[GFX_ABLENK].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
+  graphic_info[GFX_ABLENK].src_x = 0;
+  graphic_info[GFX_ABLENK].src_y = 0;
+
+  graphic_info[GFX_ABLENK + 1].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
+  graphic_info[GFX_ABLENK + 2].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
+  graphic_info[GFX_ABLENK + 3].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
+  graphic_info[GFX_ABLENK + 1].src_x = 1 * TILEX;
+  graphic_info[GFX_ABLENK + 2].src_x = 2 * TILEX;
+  graphic_info[GFX_ABLENK + 3].src_x = 3 * TILEX;
+  graphic_info[GFX_ABLENK + 1].src_y = 0;
+  graphic_info[GFX_ABLENK + 2].src_y = 0;
+  graphic_info[GFX_ABLENK + 3].src_y = 0;
+#endif
+}
+
+static void InitSoundInfo()
+{
+  sound_files = getCurrentSoundList();
+
+  /* initialize sound effect lookup table for element actions */
+  InitGameSound();
 }
 
 void InitElementProperties()
@@ -874,54 +1157,54 @@ void InitElementProperties()
 
   static int ep_amoebalive[] =
   {
-    EL_AMOEBE_NASS,
-    EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL,
-    EL_AMOEBE_BD
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA
   };
   static int ep_amoebalive_num = SIZEOF_ARRAY_INT(ep_amoebalive);
 
   static int ep_amoeboid[] =
   {
-    EL_AMOEBE_TOT,
-    EL_AMOEBE_NASS,
-    EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL,
-    EL_AMOEBE_BD
+    EL_AMOEBA_DEAD,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA
   };
   static int ep_amoeboid_num = SIZEOF_ARRAY_INT(ep_amoeboid);
 
   static int ep_schluessel[] =
   {
-    EL_SCHLUESSEL1,
-    EL_SCHLUESSEL2,
-    EL_SCHLUESSEL3,
-    EL_SCHLUESSEL4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4
+    EL_KEY1,
+    EL_KEY2,
+    EL_KEY3,
+    EL_KEY4,
+    EL_EM_KEY1,
+    EL_EM_KEY2,
+    EL_EM_KEY3,
+    EL_EM_KEY4
   };
   static int ep_schluessel_num = SIZEOF_ARRAY_INT(ep_schluessel);
 
   static int ep_pforte[] =
   {
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
-    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_GATE1,
+    EL_GATE2,
+    EL_GATE3,
+    EL_GATE4,
+    EL_GATE1_GRAY,
+    EL_GATE2_GRAY,
+    EL_GATE3_GRAY,
+    EL_GATE4_GRAY,
+    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,
@@ -930,13 +1213,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,
@@ -946,45 +1229,45 @@ void InitElementProperties()
 
   static int ep_solid[] =
   {
-    EL_BETON,
-    EL_MAUERWERK,
-    EL_MAUER_LEBT,
-    EL_MAUER_X,
-    EL_MAUER_Y,
-    EL_MAUER_XY,
+    EL_STEELWALL,
+    EL_WALL,
+    EL_WALL_GROWING,
+    EL_WALL_GROWING_X,
+    EL_WALL_GROWING_Y,
+    EL_WALL_GROWING_XY,
     EL_BD_WALL,
-    EL_FELSBODEN,
-    EL_AUSGANG_ZU,
-    EL_AUSGANG_ACT,
-    EL_AUSGANG_AUF,
-    EL_AMOEBE_TOT,
-    EL_AMOEBE_NASS,
-    EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL,
-    EL_AMOEBE_BD,
-    EL_MORAST_VOLL,
-    EL_MORAST_LEER,
+    EL_WALL_CRUMBLED,
+    EL_EXIT_CLOSED,
+    EL_EXIT_OPENING,
+    EL_EXIT_OPEN,
+    EL_AMOEBA_DEAD,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    EL_QUICKSAND_FULL,
+    EL_QUICKSAND_EMPTY,
     EL_QUICKSAND_FILLING,
     EL_QUICKSAND_EMPTYING,
-    EL_MAGIC_WALL_OFF,
-    EL_MAGIC_WALL_EMPTY,
+    EL_MAGIC_WALL,
+    EL_MAGIC_WALL_ACTIVE,
     EL_MAGIC_WALL_EMPTYING,
     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_LIFE,
-    EL_LIFE_ASYNC,
-    EL_BADEWANNE1,
-    EL_BADEWANNE2,
-    EL_BADEWANNE3,
-    EL_BADEWANNE4,
-    EL_BADEWANNE5,
+    EL_BD_MAGIC_WALL,
+    EL_BD_MAGIC_WALL_ACTIVE,
+    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,
+    EL_ACIDPOOL_TOPRIGHT,
+    EL_ACIDPOOL_BOTTOMLEFT,
+    EL_ACIDPOOL_BOTTOM,
+    EL_ACIDPOOL_BOTTOMRIGHT,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
@@ -1003,26 +1286,30 @@ 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_TIMEGATE_SWITCH_OFF,
-    EL_TIMEGATE_SWITCH_ON,
+    EL_SP_EXIT_CLOSED,
+    EL_SP_EXIT_OPEN,
+    EL_INVISIBLE_STEELWALL,
+    EL_INVISIBLE_STEELWALL_ACTIVE,
+    EL_INVISIBLE_WALL,
+    EL_INVISIBLE_WALL_ACTIVE,
+    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,
+    EL_TIMEGATE_SWITCH_ACTIVE,
     EL_SIGN_EXCLAMATION,
     EL_SIGN_RADIOACTIVITY,
     EL_SIGN_STOP,
@@ -1035,38 +1322,38 @@ 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,
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
-    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_GATE1,
+    EL_GATE2,
+    EL_GATE3,
+    EL_GATE4,
+    EL_GATE1_GRAY,
+    EL_GATE2_GRAY,
+    EL_GATE3_GRAY,
+    EL_GATE4_GRAY,
+    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,
@@ -1075,13 +1362,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,
@@ -1091,13 +1378,13 @@ void InitElementProperties()
 
   static int ep_massive[] =
   {
-    EL_BETON,
-    EL_SALZSAEURE,
-    EL_BADEWANNE1,
-    EL_BADEWANNE2,
-    EL_BADEWANNE3,
-    EL_BADEWANNE4,
-    EL_BADEWANNE5,
+    EL_STEELWALL,
+    EL_ACID,
+    EL_ACIDPOOL_TOPLEFT,
+    EL_ACIDPOOL_TOPRIGHT,
+    EL_ACIDPOOL_BOTTOMLEFT,
+    EL_ACIDPOOL_BOTTOM,
+    EL_ACIDPOOL_BOTTOMRIGHT,
     EL_SP_HARD_GRAY,
     EL_SP_HARD_GREEN,
     EL_SP_HARD_BLUE,
@@ -1109,21 +1396,22 @@ 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_INVISIBLE_STEELWALL_ACTIVE,
+    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,
@@ -1136,28 +1424,28 @@ 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_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
-    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_GATE1,
+    EL_GATE2,
+    EL_GATE3,
+    EL_GATE4,
+    EL_GATE1_GRAY,
+    EL_GATE2_GRAY,
+    EL_GATE3_GRAY,
+    EL_GATE4_GRAY,
+    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,
@@ -1166,13 +1454,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,
@@ -1182,27 +1470,27 @@ void InitElementProperties()
 
   static int ep_slippery[] =
   {
-    EL_FELSBODEN,
+    EL_WALL_CRUMBLED,
     EL_BD_WALL,
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
-    EL_BOMBE,
-    EL_KOKOSNUSS,
-    EL_ABLENK_EIN,
-    EL_ABLENK_AUS,
-    EL_ZEIT_VOLL,
-    EL_ZEIT_LEER,
-    EL_BIRNE_EIN,
-    EL_BIRNE_AUS,
-    EL_BADEWANNE1,
-    EL_BADEWANNE2,
-    EL_SONDE,
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND,
+    EL_BOMB,
+    EL_NUT,
+    EL_ROBOT_WHEEL_ACTIVE,
+    EL_ROBOT_WHEEL,
+    EL_TIME_ORB_FULL,
+    EL_TIME_ORB_EMPTY,
+    EL_LAMP_ACTIVE,
+    EL_LAMP,
+    EL_ACIDPOOL_TOPLEFT,
+    EL_ACIDPOOL_TOPRIGHT,
+    EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
     EL_SP_CHIP_SINGLE,
@@ -1211,7 +1499,7 @@ void InitElementProperties()
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
     EL_SPEED_PILL,
-    EL_STEEL_SLANTED,
+    EL_STEELWALL_SLANTED,
     EL_PEARL,
     EL_CRYSTAL
   };
@@ -1219,12 +1507,12 @@ void InitElementProperties()
 
   static int ep_enemy[] =
   {
-    EL_KAEFER,
-    EL_FLIEGER,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
-    EL_MAMPFER,
-    EL_MAMPFER2,
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
     EL_ROBOT,
     EL_PACMAN,
     EL_SP_SNIKSNAK,
@@ -1234,33 +1522,33 @@ void InitElementProperties()
 
   static int ep_mauer[] =
   {
-    EL_BETON,
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
-    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_AUSGANG_ZU,
-    EL_AUSGANG_ACT,
-    EL_AUSGANG_AUF,
-    EL_MAUERWERK,
-    EL_FELSBODEN,
-    EL_MAUER_LEBT,
-    EL_MAUER_X,
-    EL_MAUER_Y,
-    EL_MAUER_XY,
-    EL_MAUERND,
+    EL_STEELWALL,
+    EL_GATE1,
+    EL_GATE2,
+    EL_GATE3,
+    EL_GATE4,
+    EL_GATE1_GRAY,
+    EL_GATE2_GRAY,
+    EL_GATE3_GRAY,
+    EL_GATE4_GRAY,
+    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_EXIT_OPENING,
+    EL_EXIT_OPEN,
+    EL_WALL,
+    EL_WALL_CRUMBLED,
+    EL_WALL_GROWING,
+    EL_WALL_GROWING_X,
+    EL_WALL_GROWING_Y,
+    EL_WALL_GROWING_XY,
+    EL_WALL_GROWING_ACTIVE,
     EL_BD_WALL,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
@@ -1280,42 +1568,46 @@ 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_SP_EXIT_OPEN,
+    EL_INVISIBLE_STEELWALL,
+    EL_INVISIBLE_STEELWALL_ACTIVE,
+    EL_INVISIBLE_WALL,
+    EL_INVISIBLE_WALL_ACTIVE,
+    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);
 
   static int ep_can_fall[] =
   {
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
-    EL_BOMBE,
-    EL_KOKOSNUSS,
-    EL_TROPFEN,
-    EL_MORAST_VOLL,
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND,
+    EL_BOMB,
+    EL_NUT,
+    EL_AMOEBA_DROP,
+    EL_QUICKSAND_FULL,
     EL_MAGIC_WALL_FULL,
-    EL_MAGIC_WALL_BD_FULL,
-    EL_ZEIT_VOLL,
-    EL_ZEIT_LEER,
+    EL_BD_MAGIC_WALL_FULL,
+    EL_TIME_ORB_FULL,
+    EL_TIME_ORB_EMPTY,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
     EL_SP_DISK_ORANGE,
@@ -1328,27 +1620,27 @@ void InitElementProperties()
 
   static int ep_can_smash[] =
   {
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
-    EL_SCHLUESSEL1,
-    EL_SCHLUESSEL2,
-    EL_SCHLUESSEL3,
-    EL_SCHLUESSEL4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4,
-    EL_BOMBE,
-    EL_KOKOSNUSS,
-    EL_TROPFEN,
-    EL_ZEIT_VOLL,
-    EL_ZEIT_LEER,
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND,
+    EL_KEY1,
+    EL_KEY2,
+    EL_KEY3,
+    EL_KEY4,
+    EL_EM_KEY1,
+    EL_EM_KEY2,
+    EL_EM_KEY3,
+    EL_EM_KEY4,
+    EL_BOMB,
+    EL_NUT,
+    EL_AMOEBA_DROP,
+    EL_TIME_ORB_FULL,
+    EL_TIME_ORB_EMPTY,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
     EL_SP_DISK_ORANGE,
@@ -1361,32 +1653,32 @@ void InitElementProperties()
 
   static int ep_can_change[] =
   {
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT
+    EL_EMERALD,
+    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);
 
   static int ep_can_move[] =
   {
-    EL_KAEFER,
-    EL_FLIEGER,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
-    EL_MAMPFER,
-    EL_MAMPFER2,
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
     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,
@@ -1396,22 +1688,22 @@ void InitElementProperties()
 
   static int ep_could_move[] =
   {
-    EL_KAEFER_RIGHT,
-    EL_KAEFER_UP,
-    EL_KAEFER_LEFT,
-    EL_KAEFER_DOWN,
-    EL_FLIEGER_RIGHT,
-    EL_FLIEGER_UP,
-    EL_FLIEGER_LEFT,
-    EL_FLIEGER_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_BUG_RIGHT,
+    EL_BUG_UP,
+    EL_BUG_LEFT,
+    EL_BUG_DOWN,
+    EL_SPACESHIP_RIGHT,
+    EL_SPACESHIP_UP,
+    EL_SPACESHIP_LEFT,
+    EL_SPACESHIP_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,
@@ -1421,28 +1713,28 @@ void InitElementProperties()
 
   static int ep_dont_touch[] =
   {
-    EL_KAEFER,
-    EL_FLIEGER,
-    EL_BUTTERFLY,
-    EL_FIREFLY
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY
   };
   static int ep_dont_touch_num = SIZEOF_ARRAY_INT(ep_dont_touch);
 
   static int ep_dont_go_to[] =
   {
-    EL_KAEFER,
-    EL_FLIEGER,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
-    EL_MAMPFER,
-    EL_MAMPFER2,
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
     EL_ROBOT,
     EL_PACMAN,
-    EL_TROPFEN,
-    EL_SALZSAEURE,
+    EL_AMOEBA_DROP,
+    EL_ACID,
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
-    EL_SP_BUG_ACTIVE,
+    EL_SP_BUGGY_BASE_ACTIVE,
     EL_TRAP_ACTIVE,
     EL_LANDMINE
   };
@@ -1450,26 +1742,26 @@ void InitElementProperties()
 
   static int ep_mampf2[] =
   {
-    EL_ERDREICH,
-    EL_KAEFER,
-    EL_FLIEGER,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
-    EL_MAMPFER,
+    EL_SAND,
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+    EL_YAMYAM,
     EL_ROBOT,
     EL_PACMAN,
-    EL_TROPFEN,
-    EL_AMOEBE_TOT,
-    EL_AMOEBE_NASS,
-    EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL,
-    EL_AMOEBE_BD,
-    EL_EDELSTEIN,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
+    EL_AMOEBA_DROP,
+    EL_AMOEBA_DEAD,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND,
     EL_PEARL,
     EL_CRYSTAL
   };
@@ -1477,119 +1769,120 @@ void InitElementProperties()
 
   static int ep_bd_element[] =
   {
-    EL_LEERRAUM,
-    EL_ERDREICH,
-    EL_FELSBODEN,
+    EL_EMPTY,
+    EL_SAND,
+    EL_WALL_CRUMBLED,
     EL_BD_WALL,
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN_BD,
-    EL_MAGIC_WALL_BD_OFF,
-    EL_AUSGANG_ZU,
-    EL_AUSGANG_AUF,
-    EL_BETON,
-    EL_SPIELFIGUR,
-    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_AMOEBE_BD,
-    EL_CHAR_FRAGE
+    EL_BD_DIAMOND,
+    EL_BD_MAGIC_WALL,
+    EL_EXIT_CLOSED,
+    EL_EXIT_OPEN,
+    EL_STEELWALL,
+    EL_PLAYER1,
+    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
   };
   static int ep_bd_element_num = SIZEOF_ARRAY_INT(ep_bd_element);
 
   static int ep_sb_element[] =
   {
-    EL_LEERRAUM,
-    EL_BETON,
-    EL_SOKOBAN_OBJEKT,
-    EL_SOKOBAN_FELD_LEER,
-    EL_SOKOBAN_FELD_VOLL,
-    EL_SPIELFIGUR,
-    EL_INVISIBLE_STEEL
+    EL_EMPTY,
+    EL_STEELWALL,
+    EL_SOKOBAN_OBJECT,
+    EL_SOKOBAN_FIELD_EMPTY,
+    EL_SOKOBAN_FIELD_FULL,
+    EL_PLAYER1,
+    EL_INVISIBLE_STEELWALL
   };
   static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element);
 
   static int ep_gem[] =
   {
-    EL_EDELSTEIN,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND
   };
   static int ep_gem_num = SIZEOF_ARRAY_INT(ep_gem);
 
   static int ep_inactive[] =
   {
-    EL_LEERRAUM,
-    EL_ERDREICH,
-    EL_MAUERWERK,
+    EL_EMPTY,
+    EL_SAND,
+    EL_WALL,
     EL_BD_WALL,
-    EL_FELSBODEN,
-    EL_SCHLUESSEL,
-    EL_BETON,
-    EL_AMOEBE_TOT,
-    EL_MORAST_LEER,
-    EL_BADEWANNE,
-    EL_ABLENK_AUS,
-    EL_SCHLUESSEL1,
-    EL_SCHLUESSEL2,
-    EL_SCHLUESSEL3,
-    EL_SCHLUESSEL4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4,
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
-    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_DYNAMITE_INACTIVE,
-    EL_UNSICHTBAR,
-    EL_BIRNE_AUS,
-    EL_BIRNE_EIN,
-    EL_ERZ_EDEL,
-    EL_ERZ_DIAM,
-    EL_ERZ_EDEL_BD,
-    EL_ERZ_EDEL_GELB,
+    EL_WALL_CRUMBLED,
+    EL_STEELWALL,
+    EL_AMOEBA_DEAD,
+    EL_QUICKSAND_EMPTY,
+    EL_STONEBLOCK,
+    EL_ROBOT_WHEEL,
+    EL_KEY1,
+    EL_KEY2,
+    EL_KEY3,
+    EL_KEY4,
+    EL_EM_KEY1,
+    EL_EM_KEY2,
+    EL_EM_KEY3,
+    EL_EM_KEY4,
+    EL_GATE1,
+    EL_GATE2,
+    EL_GATE3,
+    EL_GATE4,
+    EL_GATE1_GRAY,
+    EL_GATE2_GRAY,
+    EL_GATE3_GRAY,
+    EL_GATE4_GRAY,
+    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_STEELWALL,
+    EL_INVISIBLE_WALL,
+    EL_INVISIBLE_SAND,
+    EL_LAMP,
+    EL_LAMP_ACTIVE,
+    EL_WALL_EMERALD,
+    EL_WALL_DIAMOND,
+    EL_WALL_BD_DIAMOND,
+    EL_WALL_EMERALD_YELLOW,
     EL_DYNABOMB_NR,
     EL_DYNABOMB_SZ,
     EL_DYNABOMB_XL,
-    EL_SOKOBAN_OBJEKT,
-    EL_SOKOBAN_FELD_LEER,
-    EL_SOKOBAN_FELD_VOLL,
-    EL_ERZ_EDEL_ROT,
-    EL_ERZ_EDEL_LILA,
-    EL_BADEWANNE1,
-    EL_BADEWANNE2,
-    EL_BADEWANNE3,
-    EL_BADEWANNE4,
-    EL_BADEWANNE5,
-    EL_MAGIC_WALL_OFF,
+    EL_SOKOBAN_OBJECT,
+    EL_SOKOBAN_FIELD_EMPTY,
+    EL_SOKOBAN_FIELD_FULL,
+    EL_WALL_EMERALD_RED,
+    EL_WALL_EMERALD_PURPLE,
+    EL_ACIDPOOL_TOPLEFT,
+    EL_ACIDPOOL_TOPRIGHT,
+    EL_ACIDPOOL_BOTTOMLEFT,
+    EL_ACIDPOOL_BOTTOM,
+    EL_ACIDPOOL_BOTTOMRIGHT,
+    EL_MAGIC_WALL,
     EL_MAGIC_WALL_DEAD,
-    EL_MAGIC_WALL_BD_OFF,
-    EL_MAGIC_WALL_BD_DEAD,
-    EL_AMOEBA2DIAM,
+    EL_BD_MAGIC_WALL,
+    EL_BD_MAGIC_WALL_DEAD,
+    EL_AMOEBA_TO_DIAMOND,
     EL_BLOCKED,
     EL_SP_EMPTY,
     EL_SP_BASE,
@@ -1622,20 +1915,18 @@ 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_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,
@@ -1648,40 +1939,40 @@ 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);
 
   static int ep_explosive[] =
   {
-    EL_BOMBE,
+    EL_BOMB,
     EL_DYNAMITE_ACTIVE,
-    EL_DYNAMITE_INACTIVE,
-    EL_DYNABOMB_ACTIVE_1,
-    EL_DYNABOMB_ACTIVE_2,
-    EL_DYNABOMB_ACTIVE_3,
-    EL_DYNABOMB_ACTIVE_4,
+    EL_DYNAMITE,
+    EL_DYNABOMB_PLAYER1_ACTIVE,
+    EL_DYNABOMB_PLAYER2_ACTIVE,
+    EL_DYNABOMB_PLAYER3_ACTIVE,
+    EL_DYNABOMB_PLAYER4_ACTIVE,
     EL_DYNABOMB_NR,
     EL_DYNABOMB_SZ,
     EL_DYNABOMB_XL,
-    EL_KAEFER,
+    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,
@@ -1693,12 +1984,12 @@ void InitElementProperties()
 
   static int ep_mampf3[] =
   {
-    EL_EDELSTEIN,
-    EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND,
     EL_PEARL,
     EL_CRYSTAL
   };
@@ -1706,14 +1997,14 @@ void InitElementProperties()
 
   static int ep_pushable[] =
   {
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_BOMBE,
-    EL_KOKOSNUSS,
-    EL_ZEIT_LEER,
-    EL_SOKOBAN_FELD_VOLL,
-    EL_SOKOBAN_OBJEKT,
-    EL_SONDE,
+    EL_BOMB,
+    EL_NUT,
+    EL_TIME_ORB_EMPTY,
+    EL_SOKOBAN_FIELD_FULL,
+    EL_SOKOBAN_OBJECT,
+    EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_DISK_ORANGE,
     EL_SP_DISK_YELLOW,
@@ -1725,31 +2016,31 @@ void InitElementProperties()
 
   static int ep_player[] =
   {
-    EL_SPIELFIGUR,
-    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);
 
   static int ep_has_content[] =
   {
-    EL_MAMPFER,
-    EL_AMOEBE_NASS,
-    EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL,
-    EL_AMOEBE_BD
+    EL_YAMYAM,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA
   };
   static int ep_has_content_num = SIZEOF_ARRAY_INT(ep_has_content);
 
   static int ep_eatable[] =
   {
-    EL_ERDREICH,
+    EL_SAND,
     EL_SP_BASE,
-    EL_SP_BUG,
-    EL_TRAP_INACTIVE,
-    EL_SAND_INVISIBLE
+    EL_SP_BUGGY_BASE,
+    EL_TRAP,
+    EL_INVISIBLE_SAND,
+    EL_INVISIBLE_SAND_ACTIVE
   };
   static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable);
 
@@ -1762,7 +2053,8 @@ void InitElementProperties()
     EL_SP_INFOTRON,
     EL_SP_CHIP_SINGLE,
     EL_SP_HARD_GRAY,
-    EL_SP_EXIT,
+    EL_SP_EXIT_CLOSED,
+    EL_SP_EXIT_OPEN,
     EL_SP_DISK_ORANGE,
     EL_SP_PORT1_RIGHT,
     EL_SP_PORT1_DOWN,
@@ -1780,7 +2072,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,
@@ -1796,7 +2088,7 @@ void InitElementProperties()
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
     /* additional elements that appeared in newer Supaplex levels */
-    EL_UNSICHTBAR,
+    EL_INVISIBLE_WALL,
     /* more than one murphy in a level results in an inactive clone */
     EL_SP_MURPHY_CLONE
   };
@@ -1804,14 +2096,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,
@@ -1841,13 +2133,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,
@@ -1858,56 +2150,73 @@ void InitElementProperties()
   static int ep_active_bomb[] =
   {
     EL_DYNAMITE_ACTIVE,
-    EL_DYNABOMB_ACTIVE_1,
-    EL_DYNABOMB_ACTIVE_2,
-    EL_DYNABOMB_ACTIVE_3,
-    EL_DYNABOMB_ACTIVE_4
+    EL_DYNABOMB_PLAYER1_ACTIVE,
+    EL_DYNABOMB_PLAYER2_ACTIVE,
+    EL_DYNABOMB_PLAYER3_ACTIVE,
+    EL_DYNABOMB_PLAYER4_ACTIVE
   };
   static int ep_active_bomb_num = SIZEOF_ARRAY_INT(ep_active_bomb);
 
   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_active[] =
+  {
+    EL_CONVEYOR_BELT1_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT1_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT1_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT2_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT2_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT2_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT3_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT3_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT3_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT4_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT4_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT4_RIGHT_ACTIVE,
+  };
+  static int ep_belt_active_num = SIZEOF_ARRAY_INT(ep_belt_active);
+
   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);
 
   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,
@@ -1952,6 +2261,7 @@ void InitElementProperties()
   static long ep2_bit[] =
   {
     EP_BIT_BELT,
+    EP_BIT_BELT_ACTIVE,
     EP_BIT_BELT_SWITCH,
     EP_BIT_TUBE
   };
@@ -1992,6 +2302,7 @@ void InitElementProperties()
   static int *ep2_array[] =
   {
     ep_belt,
+    ep_belt_active,
     ep_belt_switch,
     ep_tube
   };
@@ -2032,6 +2343,7 @@ void InitElementProperties()
   static int *ep2_num[] =
   {
     &ep_belt_num,
+    &ep_belt_active_num,
     &ep_belt_switch_num,
     &ep_tube_num
   };
@@ -2069,10 +2381,10 @@ void Execute_Debug_Command(char *command)
     printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
     printf("\n");
 
-    for (i=0; i<NUM_IMAGE_CONFIG_ENTRIES; i++)
+    for (i=0; image_config[i].token != NULL; i++)
       printf("# %s\n",
             getFormattedSetupEntry(image_config[i].token,
-                                   image_config[i].default_filename));
+                                   image_config[i].value));
   }
   else if (strcmp(command, "create soundsinfo.conf") == 0)
   {
@@ -2086,10 +2398,10 @@ void Execute_Debug_Command(char *command)
     printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
     printf("\n");
 
-    for (i=0; i<NUM_SOUND_CONFIG_ENTRIES; i++)
+    for (i=0; sound_config[i].token != NULL; i++)
       printf("# %s\n",
             getFormattedSetupEntry(sound_config[i].token,
-                                   sound_config[i].default_filename));
+                                   sound_config[i].value));
   }
   else if (strcmp(command, "create musicinfo.conf") == 0)
   {
@@ -2117,6 +2429,8 @@ void CloseAllAndExit(int exit_value)
   FreeAllMusic();
   CloseAudio();                /* called after freeing sounds (needed for SDL) */
 
+  FreeAllImages();
+
   FreeTileClipmasks();
   for(i=0; i<NUM_BITMAPS; i++)
     FreeBitmap(pix[i]);