X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Finit.c;h=5a97a827c04b233c654bc8febe8f56caa9ebd07c;hp=183ba2b9a45862ff63d71ee25ca8666d2c405036;hb=601cca5b35649856ff49e1bcb3806592b736662c;hpb=22473d4140e896b64767e3349ef308f69b7668b9

diff --git a/src/init.c b/src/init.c
index 183ba2b9..5a97a827 100644
--- a/src/init.c
+++ b/src/init.c
@@ -26,45 +26,42 @@
 #include "cartoons.h"
 #include "config.h"
 
-static char *image_filename[NUM_PICTURES] =
+#include "conf_e2g.c"	/* include auto-generated data structure definitions */
+#include "conf_esg.c"	/* include auto-generated data structure definitions */
+
+
+static Bitmap *bitmap_font_initial = NULL;
+
+static void InitGlobal();
+static void InitSetup();
+static void InitPlayerInfo();
+static void InitLevelInfo();
+static void InitArtworkInfo();
+static void InitLevelArtworkInfo();
+static void InitNetworkServer();
+static void InitArtworkConfig();
+static void InitImages();
+static void InitMixer();
+static void InitSound();
+static void InitMusic();
+static void InitGfx();
+static void InitGfxBackground();
+static void InitGadgets();
+static void InitElementSmallImages();
+static void InitElementGraphicInfo();
+static void InitElementSpecialGraphicInfo();
+static void InitElementSoundInfo();
+static void InitElementProperties();
+static void InitGraphicInfo();
+static void InitSoundInfo();
+static void Execute_Command(char *);
+
+void OpenAll()
 {
-  "RocksScreen.pcx",
-  "RocksDoor.pcx",
-  "RocksHeroes.pcx",
-  "RocksToons.pcx",
-  "RocksSP.pcx",
-  "RocksDC.pcx",
-  "RocksMore.pcx",
-  "RocksFont.pcx",
-  "RocksFont2.pcx",
-  "RocksFont3.pcx"
-}; 
-
-static void InitSetup(void);
-static void InitPlayerInfo(void);
-static void InitLevelInfo(void);
-static void InitArtworkInfo(void);
-static void InitLevelArtworkInfo(void);
-static void InitNetworkServer(void);
-static void InitImages(void);
-static void InitMixer(void);
-static void InitSound(void);
-static void InitGfx(void);
-static void InitGfxBackground(void);
-static void InitGadgets(void);
-static void InitElementProperties(void);
-static void InitElementInfo(void);
-static void InitGraphicInfo(void);
-static void Execute_Debug_Command(char *);
-
-void OpenAll(void)
-{
-  if (options.debug_command)
-  {
-    Execute_Debug_Command(options.debug_command);
+  InitGlobal();		/* initialize some global variables */
 
-    exit(0);
-  }
+  if (options.execute_command)
+    Execute_Command(options.execute_command);
 
   if (options.serveronly)
   {
@@ -85,9 +82,11 @@ void OpenAll(void)
   InitSetup();
   InitPlayerInfo();
   InitArtworkInfo();		/* needed before loading gfx, sound & music */
+  InitArtworkConfig();		/* needed before forking sound child process */
+  InitMixer();
 
   InitCounter();
-  InitMixer();
+
   InitJoysticks();
   InitRND(NEW_RANDOMIZE);
 
@@ -97,31 +96,45 @@ void OpenAll(void)
 
   InitEventFilter(FilterMouseMotionEvents);
 
+  InitElementProperties();
+
   InitGfx();
-  InitElementProperties();	/* initializes IS_CHAR() for el2gfx() */
-  InitElementInfo();
-  InitGraphicInfo();
 
   InitLevelInfo();
   InitLevelArtworkInfo();
-  InitGadgets();		/* needs to know number of level series */
+
   InitImages();			/* needs to know current level directory */
   InitSound();			/* needs to know current level directory */
+  InitMusic();			/* needs to know current level directory */
 
   InitGfxBackground();
-  InitToons();
+
+  if (global.autoplay_leveldir)
+  {
+    AutoPlayTape();
+    return;
+  }
 
   DrawMainMenu();
 
   InitNetworkServer();
 }
 
-void InitSetup()
+static void InitGlobal()
+{
+  global.autoplay_leveldir = NULL;
+
+  global.frames_per_second = 0;
+  global.fps_slowdown = FALSE;
+  global.fps_slowdown_factor = 1;
+}
+
+static void InitSetup()
 {
   LoadSetup();					/* global setup info */
 }
 
-void InitPlayerInfo()
+static void InitPlayerInfo()
 {
   int i;
 
@@ -134,18 +147,45 @@ void InitPlayerInfo()
   local_player->connected = TRUE;
 }
 
-void InitLevelInfo()
+static void InitLevelInfo()
 {
   LoadLevelInfo();				/* global level info */
   LoadLevelSetup_LastSeries();			/* last played series info */
   LoadLevelSetup_SeriesInfo();			/* last played level info */
 }
 
-void InitArtworkInfo()
+static void InitArtworkInfo()
 {
   LoadArtworkInfo();
 }
 
+static void InitArtworkConfig()
+{
+  static char *element_prefix[MAX_NUM_ELEMENTS + 1];
+  static char *sound_class_prefix[MAX_NUM_ELEMENTS + 1];
+  static char *action_suffix[NUM_ACTIONS + 1];
+  static char *direction_suffix[NUM_DIRECTIONS + 1];
+  static char *special_suffix[NUM_SPECIAL_GFX_ARGS + 1];
+  static char *dummy[1] = { NULL };
+  int i;
+
+  for (i=0; i<MAX_NUM_ELEMENTS + 1; i++)
+    element_prefix[i] = element_info[i].token_name;
+  for (i=0; i<MAX_NUM_ELEMENTS + 1; i++)
+    sound_class_prefix[i] = element_info[i].sound_class_name;
+  for (i=0; i<NUM_ACTIONS + 1; i++)
+    action_suffix[i] = element_action_info[i].suffix;
+  for (i=0; i<NUM_DIRECTIONS + 1; i++)
+    direction_suffix[i] = element_direction_info[i].suffix;
+  for (i=0; i<NUM_SPECIAL_GFX_ARGS + 1; i++)
+    special_suffix[i] = special_suffix_info[i].suffix;
+
+  InitImageList(image_config, NUM_IMAGE_FILES, image_config_suffix,
+		element_prefix, action_suffix,direction_suffix,special_suffix);
+  InitSoundList(sound_config, NUM_SOUND_FILES, sound_config_suffix,
+		sound_class_prefix, action_suffix, dummy, dummy);
+}
+
 void InitLevelArtworkInfo()
 {
   LoadLevelArtworkInfo();
@@ -174,39 +214,77 @@ void InitNetworkServer()
 #endif
 }
 
-static void InitImages()
+static void InitMixer()
+{
+  OpenAudio();
+  StartMixer();
+}
+
+static void ReinitializeGraphics()
 {
-  InitImageList(image_config, NUM_IMAGE_CONFIG_ENTRIES);
+  InitElementGraphicInfo();		/* element game graphic mapping */
+  InitElementSpecialGraphicInfo();	/* element special graphic mapping */
+  InitGraphicInfo();			/* graphic properties mapping */
 
-  /* load custom images */
-  ReloadCustomImages();
+  InitElementSmallImages();		/* create editor and preview images */
+
+  InitFontInfo(bitmap_font_initial,
+	       graphic_info[IMG_FONT_BIG].bitmap,
+	       graphic_info[IMG_FONT_MEDIUM].bitmap,
+	       graphic_info[IMG_FONT_SMALL].bitmap,
+	       graphic_info[IMG_FONT_EM].bitmap);
+
+  SetMainBackgroundImage(IMG_BACKGROUND_DEFAULT);
+  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
+
+  InitGadgets();
+  InitToons();
 }
 
-static void InitMixer()
+static void ReinitializeSounds()
 {
-  OpenAudio();
-  InitSoundList(sound_config, NUM_SOUND_CONFIG_ENTRIES);
+  InitElementSoundInfo();	/* element game sound mapping */
+  InitSoundInfo();		/* sound properties mapping */
 
-  StartMixer();
+  InitPlaySoundLevel();		/* internal game sound settings */
+}
+
+static void ReinitializeMusic()
+{
+  /* currently nothing to do */
+}
+
+static void InitImages()
+{
+  ReloadCustomImages();
+  ReinitializeGraphics();
+
+  LoadCustomElementDescriptions();
+  LoadSpecialMenuDesignSettings();
 }
 
 static void InitSound()
 {
-  /* load custom sounds and music */
-  InitReloadSounds(artwork.snd_current->identifier);
-  InitReloadMusic(artwork.mus_current->identifier);
+  InitReloadCustomSounds(artwork.snd_current->identifier);
+  ReinitializeSounds();
+}
 
-  /* initialize sound effect lookup table for element actions */
-  InitGameSound();
+static void InitMusic()
+{
+  InitReloadCustomMusic(artwork.mus_current->identifier);
+  ReinitializeMusic();
 }
 
 static void InitTileClipmasks()
 {
+#if 0
 #if defined(TARGET_X11)
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
 
 #if defined(TARGET_X11_NATIVE)
+
+#if 0
   GC copy_clipmask_gc;
 
   static struct
@@ -260,13 +338,15 @@ static void InitTileClipmasks()
     { GFX2_SHIELD_ACTIVE, 3 },
     { -1, 0 }
   };
+#endif
+
 #endif /* TARGET_X11_NATIVE */
 #endif /* TARGET_X11 */
 
   int i;
 
   /* initialize pixmap array for special X11 tile clipping to Pixmap 'None' */
-  for(i=0; i<NUM_TILES; i++)
+  for (i=0; i<NUM_TILES; i++)
     tile_clipmask[i] = None;
 
 #if defined(TARGET_X11)
@@ -280,7 +360,8 @@ static void InitTileClipmasks()
   tile_clip_gc = XCreateGC(display, window->drawable,
 			   clip_gc_valuemask, &clip_gc_values);
 
-  for(i=0; i<NUM_BITMAPS; i++)
+#if 0
+  for (i=0; i<NUM_BITMAPS; i++)
   {
     if (pix[i]->clip_mask)
     {
@@ -291,9 +372,11 @@ static void InitTileClipmasks()
 					 clip_gc_valuemask, &clip_gc_values);
     }
   }
+#endif
 
 #if defined(TARGET_X11_NATIVE)
 
+#if 0
   /* create graphic context structures needed for clipping */
   clip_gc_values.graphics_exposures = False;
   clip_gc_valuemask = GCGraphicsExposures;
@@ -301,20 +384,20 @@ static void InitTileClipmasks()
 			       clip_gc_valuemask, &clip_gc_values);
 
   /* create only those clipping Pixmaps we really need */
-  for(i=0; tile_needs_clipping[i].start>=0; i++)
+  for (i=0; tile_needs_clipping[i].start>=0; i++)
   {
     int j;
 
-    for(j=0; j<tile_needs_clipping[i].count; j++)
+    for (j=0; j<tile_needs_clipping[i].count; j++)
     {
       int tile = tile_needs_clipping[i].start + j;
       int graphic = tile;
       int src_x, src_y;
-      int pixmap_nr;
+      Bitmap *src_bitmap;
       Pixmap src_pixmap;
 
-      getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
-      src_pixmap = pix[pixmap_nr]->clip_mask;
+      getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+      src_pixmap = src_bitmap->clip_mask;
 
       tile_clipmask[tile] = XCreatePixmap(display, window->drawable,
 					  TILEX, TILEY, 1);
@@ -325,17 +408,20 @@ static void InitTileClipmasks()
   }
 
   XFreeGC(display, copy_clipmask_gc);
+#endif
 
 #endif /* TARGET_X11_NATIVE */
 #endif /* TARGET_X11 */
+#endif
 }
 
 void FreeTileClipmasks()
 {
+#if 0
 #if defined(TARGET_X11)
   int i;
 
-  for(i=0; i<NUM_TILES; i++)
+  for (i=0; i<NUM_TILES; i++)
   {
     if (tile_clipmask[i] != None)
     {
@@ -348,7 +434,8 @@ void FreeTileClipmasks()
     XFreeGC(display, tile_clip_gc);
   tile_clip_gc = None;
 
-  for(i=0; i<NUM_BITMAPS; i++)
+#if 0
+  for (i=0; i<NUM_BITMAPS; i++)
   {
     if (pix[i] != NULL && pix[i]->stored_clip_gc)
     {
@@ -356,17 +443,25 @@ void FreeTileClipmasks()
       pix[i]->stored_clip_gc = None;
     }
   }
+#endif
+
 #endif /* TARGET_X11 */
+#endif
 }
 
 void InitGfx()
 {
+  char *config_token_font_initial = "font.small";
+  char *filename_font_initial = NULL;
   int i;
 
-  /* initialize some global variables */
-  global.frames_per_second = 0;
-  global.fps_slowdown = FALSE;
-  global.fps_slowdown_factor = 1;
+  /* determine filename for initial font (for displaying startup messages) */
+  for (i=0; image_config[i].token != NULL; i++)
+    if (strcmp(image_config[i].token, config_token_font_initial) == 0)
+      filename_font_initial = image_config[i].value;
+
+  if (filename_font_initial == NULL)	/* should not happen */
+    Error(ERR_EXIT, "cannot get filename for '%s'", config_token_font_initial);
 
   /* initialize screen properties */
   InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE,
@@ -376,30 +471,18 @@ void InitGfx()
   InitGfxScrollbufferInfo(FXSIZE, FYSIZE);
 
   /* create additional image buffers for double-buffering */
-  pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
-  pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
+  bitmap_db_field = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
+  bitmap_db_door  = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
 
-  pix[PIX_SMALLFONT] = LoadCustomImage(image_filename[PIX_SMALLFONT]);
+  bitmap_font_initial = LoadCustomImage(filename_font_initial);
 
-  InitFontInfo(NULL, NULL, pix[PIX_SMALLFONT]);
+  InitFontInfo(bitmap_font_initial, NULL, NULL, NULL, NULL);
 
   DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
   DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
 
   DrawInitText("Loading graphics:", 120, FC_GREEN);
 
-  for(i=0; i<NUM_PICTURES; i++)
-  {
-    if (i != PIX_SMALLFONT)
-    {
-      DrawInitText(image_filename[i], 150, FC_YELLOW);
-
-      pix[i] = LoadCustomImage(image_filename[i]);
-    }
-  }
-
-  InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]);
-
   InitTileClipmasks();
 }
 
@@ -408,15 +491,16 @@ void InitGfxBackground()
   int x, y;
 
   drawto = backbuffer;
-  fieldbuffer = pix[PIX_DB_FIELD];
+  fieldbuffer = bitmap_db_field;
   SetDrawtoField(DRAW_BACKBUFFER);
 
-  BlitBitmap(pix[PIX_BACK], backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+  BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer,
+	     0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
   ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
-  ClearRectangle(pix[PIX_DB_DOOR], 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE);
+  ClearRectangle(bitmap_db_door, 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE);
 
-  for(x=0; x<MAX_BUF_XSIZE; x++)
-    for(y=0; y<MAX_BUF_YSIZE; y++)
+  for (x=0; x<MAX_BUF_XSIZE; x++)
+    for (y=0; y<MAX_BUF_YSIZE; y++)
       redraw[x][y] = 0;
   redraw_tiles = 0;
   redraw_mask = REDRAW_ALL;
@@ -428,11 +512,21 @@ void ReloadCustomArtwork()
   static boolean last_override_level_graphics = FALSE;
   static boolean last_override_level_sounds = FALSE;
   static boolean last_override_level_music = FALSE;
-
   /* identifier for new artwork; default: artwork configured in setup */
   char *gfx_new_identifier = artwork.gfx_current->identifier;
   char *snd_new_identifier = artwork.snd_current->identifier;
   char *mus_new_identifier = artwork.mus_current->identifier;
+  boolean redraw_screen = FALSE;
+
+  if (leveldir_current_identifier == NULL)
+    leveldir_current_identifier = leveldir_current->identifier;
+
+#if 0
+  printf("CURRENT GFX: '%s' ['%s']\n", artwork.gfx_current->identifier,
+	 leveldir_current->graphics_set);
+  printf("CURRENT LEV: '%s' / '%s'\n", leveldir_current_identifier,
+	 leveldir_current->identifier);
+#endif
 
 #if 0
   printf("graphics --> '%s' ('%s')\n",
@@ -447,10 +541,6 @@ void ReloadCustomArtwork()
   if (!validLevelSeries(leveldir_current))
     return;
 
-#if 0
-  printf("--> '%s'\n", artwork.gfx_current_identifier);
-#endif
-
   /* when a new level series was selected, check if there was a change
      in custom artwork stored in level series directory */
   if (leveldir_current_identifier != leveldir_current->identifier)
@@ -484,42 +574,52 @@ void ReloadCustomArtwork()
   if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 ||
       last_override_level_graphics != setup.override_level_graphics)
   {
-    int i;
+#if 0
+    printf("RELOADING GRAPHICS '%s' -> '%s' ('%s')\n",
+	   artwork.gfx_current_identifier,
+	   artwork.gfx_current->identifier,
+	   gfx_new_identifier);
+#endif
 
     setLevelArtworkDir(artwork.gfx_first);
 
     ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
-    for(i=0; i<NUM_PICTURES; i++)
-    {
-      DrawInitText(image_filename[i], 150, FC_YELLOW);
-      ReloadCustomImage(pix[i], image_filename[i]);
-    }
-
     ReloadCustomImages();
+    ReinitializeGraphics();
+
+    LoadCustomElementDescriptions();
+    LoadSpecialMenuDesignSettings();
 
     FreeTileClipmasks();
     InitTileClipmasks();
-    InitGfxBackground();
 
-    /* force redraw of (open or closed) door graphics */
-    SetDoorState(DOOR_OPEN_ALL);
-    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
-
-    artwork.gfx_current_identifier = gfx_new_identifier;
+    artwork.gfx_current_identifier = artwork.gfx_current->identifier;
     last_override_level_graphics = setup.override_level_graphics;
+
+    redraw_screen = TRUE;
   }
 
   if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 ||
       last_override_level_sounds != setup.override_level_sounds)
   {
+#if 0
+    printf("RELOADING SOUNDS '%s' -> '%s' ('%s')\n",
+	   artwork.snd_current_identifier,
+	   artwork.snd_current->identifier,
+	   snd_new_identifier);
+#endif
+
     /* set artwork path to send it to the sound server process */
     setLevelArtworkDir(artwork.snd_first);
 
-    InitReloadSounds(snd_new_identifier);
+    InitReloadCustomSounds(snd_new_identifier);
+    ReinitializeSounds();
 
-    artwork.snd_current_identifier = snd_new_identifier;
+    artwork.snd_current_identifier = artwork.snd_current->identifier;
     last_override_level_sounds = setup.override_level_sounds;
+
+    redraw_screen = TRUE;
   }
 
   if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 ||
@@ -528,350 +628,594 @@ void ReloadCustomArtwork()
     /* set artwork path to send it to the sound server process */
     setLevelArtworkDir(artwork.mus_first);
 
-    InitReloadMusic(mus_new_identifier);
+    InitReloadCustomMusic(mus_new_identifier);
+    ReinitializeMusic();
 
-    artwork.mus_current_identifier = mus_new_identifier;
+    artwork.mus_current_identifier = artwork.mus_current->identifier;
     last_override_level_music = setup.override_level_music;
+
+    redraw_screen = TRUE;
   }
 
-#if 0
-  printf("<-- '%s'\n", artwork.gfx_current_identifier);
-#endif
+  if (redraw_screen)
+  {
+    InitGfxBackground();
+
+    /* force redraw of (open or closed) door graphics */
+    SetDoorState(DOOR_OPEN_ALL);
+    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
+  }
+}
+
+void FreeGadgets()
+{
+  FreeLevelEditorGadgets();
+  FreeGameButtons();
+  FreeTapeButtons();
+  FreeToolButtons();
+  FreeScreenGadgets();
 }
 
 void InitGadgets()
 {
+  static boolean gadgets_initialized = FALSE;
+
+  if (gadgets_initialized)
+    FreeGadgets();
+
   CreateLevelEditorGadgets();
   CreateGameButtons();
   CreateTapeButtons();
   CreateToolButtons();
   CreateScreenGadgets();
+
+  gadgets_initialized = TRUE;
 }
 
-void InitElementInfo()
+void InitElementSmallImages()
 {
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
   int i;
 
-  static struct
+  /* initialize normal images from static configuration */
+  for (i=0; element_to_graphic[i].element > -1; i++)
+    CreateImageWithSmallImages(element_to_graphic[i].graphic);
+
+  /* initialize special images from static configuration */
+  for (i=0; element_to_special_graphic[i].element > -1; i++)
+    CreateImageWithSmallImages(element_to_special_graphic[i].graphic);
+
+  /* initialize images from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
+    CreateImageWithSmallImages(property_mapping[i].artwork_index);
+}
+
+void InitElementGraphicInfo()
+{
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
+  int i, act, dir;
+
+  /* set values to -1 to identify later as "uninitialized" values */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    int element;
-    int graphic;
-  }
-  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_ROBOT,				GFX_ROBOT		},
-    { EL_BETON,				GFX_BETON		},
-    { EL_DIAMANT,			GFX_DIAMANT		},
-    { EL_MORAST_LEER,			GFX_MORAST_LEER		},
-    { EL_MORAST_VOLL,			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_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_AMOEBA_DRIPPING,		GFX_AMOEBE_NASS		},
-    { EL_KOKOSNUSS,			GFX_KOKOSNUSS		},
-    { EL_LIFE,				GFX_LIFE		},
-    { EL_LIFE_ASYNC,			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_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_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_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_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_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_PEARL,				GFX_PEARL		},
-    { EL_CRYSTAL,			GFX_CRYSTAL		},
-    { EL_WALL_PEARL,			GFX_WALL_PEARL		},
-    { EL_WALL_CRYSTAL,			GFX_WALL_CRYSTAL	},
-    { 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_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_LANDMINE,			GFX_LANDMINE		},
-    { EL_ENVELOPE,			GFX_ENVELOPE		},
-    { EL_LIGHT_SWITCH_OFF,		GFX_LIGHT_SWITCH_OFF	},
-    { EL_LIGHT_SWITCH_ON,		GFX_LIGHT_SWITCH_ON	},
-    { EL_SIGN_EXCLAMATION,		GFX_SIGN_EXCLAMATION	},
-    { EL_SIGN_RADIOACTIVITY,		GFX_SIGN_RADIOACTIVITY	},
-    { EL_SIGN_STOP,			GFX_SIGN_STOP		},
-    { EL_SIGN_WHEELCHAIR,		GFX_SIGN_WHEELCHAIR	},
-    { EL_SIGN_PARKING,			GFX_SIGN_PARKING	},
-    { EL_SIGN_ONEWAY,			GFX_SIGN_ONEWAY		},
-    { EL_SIGN_HEART,			GFX_SIGN_HEART		},
-    { EL_SIGN_TRIANGLE,			GFX_SIGN_TRIANGLE	},
-    { EL_SIGN_ROUND,			GFX_SIGN_ROUND		},
-    { EL_SIGN_EXIT,			GFX_SIGN_EXIT		},
-    { EL_SIGN_YINYANG,			GFX_SIGN_YINYANG	},
-    { EL_SIGN_OTHER,			GFX_SIGN_OTHER		},
-    { EL_MOLE_LEFT,			GFX_MOLE_LEFT		},
-    { 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_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_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_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_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_ACTIVE,			GFX_TRAP_ACTIVE		},
-    { EL_BD_WALL,			GFX_BD_WALL		},
-    { EL_BD_ROCK,			GFX_BD_ROCK		},
-    { EL_DX_SUPABOMB,			GFX_DX_SUPABOMB		},
-    { EL_SP_MURPHY_CLONE,		GFX_SP_MURPHY_CLONE	},
-    { -1,				-1			}
-  };
+    for (act=0; act<NUM_ACTIONS; act++)
+    {
+      element_info[i].graphic[act] = -1;
 
-  /* always start with reliable default values */
-  for(i=0; i<MAX_ELEMENTS; i++)
-    element_info[i].graphic = GFX_LEERRAUM;
+      for (dir=0; dir<NUM_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_CHAR_START + (i - EL_CHAR_START);
+    element_info[i].graphic[ACTION_DEFAULT] =
+      IMG_CHAR_START + (i - EL_CHAR_START);
+
+  for (i=EL_CUSTOM_START; i<=EL_CUSTOM_END; i++)
+    element_info[i].graphic[ACTION_DEFAULT] =
+      IMG_CUSTOM_START + (i - EL_CUSTOM_START);
+#endif
 
-  for (i=EL_SP_START; i<=EL_SP_END; i++)
+  /* initialize normal element/graphic mapping from static configuration */
+  for (i=0; element_to_graphic[i].element > -1; i++)
   {
-    int nr_element = i - EL_SP_START;
-    int gfx_per_line = 8;
-    int nr_graphic =
-      (nr_element / gfx_per_line) * SP_PER_LINE +
-      (nr_element % gfx_per_line);
+    int element   = element_to_graphic[i].element;
+    int action    = element_to_graphic[i].action;
+    int direction = element_to_graphic[i].direction;
+    int graphic   = element_to_graphic[i].graphic;
 
-    element_info[i].graphic = GFX_START_ROCKSSP + nr_graphic;
+    if (action < 0)
+      action = ACTION_DEFAULT;
+
+    if (direction > -1)
+      element_info[element].direction_graphic[action][direction] = graphic;
+    else
+      element_info[element].graphic[action] = graphic;
   }
 
-  /* this overrides some of the above default settings (GFX_SP_ZONK etc.) */
-  i = 0;
-  while (element_to_graphic[i].element > -1)
+  /* initialize normal element/graphic mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
   {
-    int element = element_to_graphic[i].element;
-    int graphic = element_to_graphic[i].graphic;
+    int element   = property_mapping[i].base_index;
+    int action    = property_mapping[i].ext1_index;
+    int direction = property_mapping[i].ext2_index;
+    int special   = property_mapping[i].ext3_index;
+    int graphic   = property_mapping[i].artwork_index;
+
+    if (special != -1)
+      continue;
 
-    element_info[element].graphic = graphic;
-    i++;
+    if (action < 0)
+      action = ACTION_DEFAULT;
+
+    if (direction > -1)
+      element_info[element].direction_graphic[action][direction] = graphic;
+    else
+      element_info[element].graphic[action] = graphic;
   }
+
+  /* now set all '-1' values to element specific default values */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  {
+    int default_action_graphic = element_info[i].graphic[ACTION_DEFAULT];
+    int default_action_direction_graphic[NUM_DIRECTIONS];
+
+    if (default_action_graphic == -1)
+      default_action_graphic = IMG_CHAR_QUESTION;
+
+    for (dir=0; dir<NUM_DIRECTIONS; dir++)
+    {
+      default_action_direction_graphic[dir] =
+	element_info[i].direction_graphic[ACTION_DEFAULT][dir];
+
+      if (default_action_direction_graphic[dir] == -1)
+	default_action_direction_graphic[dir] = default_action_graphic;
+    }
+
+    for (act=0; act<NUM_ACTIONS; act++)
+    {
+      for (dir=0; dir<NUM_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;
+    }
+  }
+
+#if 1
+#if DEBUG
+  if (options.verbose)
+  {
+    for (i=0; i<MAX_NUM_ELEMENTS; i++)
+      if (element_info[i].graphic[ACTION_DEFAULT] == IMG_CHAR_QUESTION &&
+	  i != EL_CHAR_QUESTION)
+	Error(ERR_RETURN, "warning: no graphic for element '%s' (%d)",
+	      element_info[i].token_name, i);
+  }
+#endif
+#endif
 }
 
-void InitGraphicInfo()
+void InitElementSpecialGraphicInfo()
 {
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
   int i;
 
   /* always start with reliable default values */
-  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;
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  {
+    element_info[i].editor_graphic = element_info[i].graphic[ACTION_DEFAULT];
+    element_info[i].preview_graphic = element_info[i].graphic[ACTION_DEFAULT];
   }
 
-  for(i=0; i<MAX_GRAPHICS; i++)
+  /* initialize special element/graphic mapping from static configuration */
+  for (i=0; element_to_special_graphic[i].element > -1; i++)
   {
-    int bitmap_nr;
+    int element = element_to_special_graphic[i].element;
+    int special = element_to_special_graphic[i].special;
+    int graphic = element_to_special_graphic[i].graphic;
+    boolean base_redefined = getImageListEntry(el2img(element))->redefined;
+    boolean special_redefined = getImageListEntry(graphic)->redefined;
 
-    getGraphicSource(i, &bitmap_nr,
-		     &graphic_info[i].src_x, &graphic_info[i].src_y);
+    if (base_redefined && !special_redefined)
+      continue;
 
-    graphic_info[i].bitmap = pix[bitmap_nr];
+    if (special == GFX_SPECIAL_ARG_EDITOR)
+      element_info[element].editor_graphic = graphic;
+    else if (special == GFX_SPECIAL_ARG_PREVIEW)
+      element_info[element].preview_graphic = graphic;
   }
+
+  /* initialize special element/graphic mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
+  {
+    int element = property_mapping[i].base_index;
+    int special = property_mapping[i].ext3_index;
+    int graphic = property_mapping[i].artwork_index;
+
+    if (special == GFX_SPECIAL_ARG_EDITOR)
+      element_info[element].editor_graphic = graphic;
+    else if (special == GFX_SPECIAL_ARG_PREVIEW)
+      element_info[element].preview_graphic = graphic;
+  }
+}
+
+static void InitElementSoundInfo()
+{
+  /* soon to come */
+}
+
+static void set_graphic_parameters(int graphic, char **parameter_raw)
+{
+  Bitmap *src_bitmap = getBitmapFromImageID(graphic);
+  int num_xtiles = (src_bitmap ? src_bitmap->width          : TILEX) / TILEX;
+  int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY;
+  int parameter[NUM_GFX_ARGS];
+  int i;
+
+  /* get integer values from string parameters */
+  for (i=0; i < NUM_GFX_ARGS; i++)
+    parameter[i] =
+      get_parameter_value(image_config_suffix[i].type, parameter_raw[i]);
+
+  graphic_info[graphic].bitmap = src_bitmap;
+
+  /* start with reliable default values */
+  graphic_info[graphic].src_x = 0;
+  graphic_info[graphic].src_y = 0;
+  graphic_info[graphic].width = TILEX;
+  graphic_info[graphic].height = TILEY;
+  graphic_info[graphic].offset_x = 0;	/* one or both of these values ... */
+  graphic_info[graphic].offset_y = 0;	/* ... will be corrected later */
+
+  /* optional x and y tile position of animation frame sequence */
+  if (parameter[GFX_ARG_XPOS] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].src_x = parameter[GFX_ARG_XPOS] * TILEX;
+  if (parameter[GFX_ARG_YPOS] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].src_y = parameter[GFX_ARG_YPOS] * TILEY;
+
+  /* optional x and y pixel position of animation frame sequence */
+  if (parameter[GFX_ARG_X] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].src_x = parameter[GFX_ARG_X];
+  if (parameter[GFX_ARG_Y] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].src_y = parameter[GFX_ARG_Y];
+
+  /* optional width and height of each animation frame */
+  if (parameter[GFX_ARG_WIDTH] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].width = parameter[GFX_ARG_WIDTH];
+  if (parameter[GFX_ARG_HEIGHT] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].height = parameter[GFX_ARG_HEIGHT];
+
+  /* correct x or y offset dependant of vertical or horizontal frame order */
+  if (parameter[GFX_ARG_VERTICAL])	/* frames are ordered vertically */
+  {
+    if (parameter[GFX_ARG_OFFSET] != ARG_UNDEFINED_VALUE)
+      graphic_info[graphic].offset_y = parameter[GFX_ARG_OFFSET];
+    else
+      graphic_info[graphic].offset_y = graphic_info[graphic].height;
+  }
+  else					/* frames are ordered horizontally */
+  {
+    if (parameter[GFX_ARG_OFFSET] != ARG_UNDEFINED_VALUE)
+      graphic_info[graphic].offset_x = parameter[GFX_ARG_OFFSET];
+    else
+      graphic_info[graphic].offset_x = graphic_info[graphic].width;
+  }
+
+  /* optionally, the x and y offset of frames can be specified directly */
+  if (parameter[GFX_ARG_XOFFSET] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].offset_x = parameter[GFX_ARG_XOFFSET];
+  if (parameter[GFX_ARG_YOFFSET] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].offset_y = parameter[GFX_ARG_YOFFSET];
+
+  /* automatically determine correct number of frames, if not defined */
+  if (parameter[GFX_ARG_FRAMES] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].anim_frames = parameter[GFX_ARG_FRAMES];
+  else if (parameter[GFX_ARG_XPOS] == 0 && !parameter[GFX_ARG_VERTICAL])
+    graphic_info[graphic].anim_frames =	num_xtiles;
+  else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL])
+    graphic_info[graphic].anim_frames =	num_ytiles;
+  else
+    graphic_info[graphic].anim_frames = 1;
+
+  graphic_info[graphic].anim_delay = parameter[GFX_ARG_DELAY];
+  if (graphic_info[graphic].anim_delay == 0)	/* delay must be at least 1 */
+    graphic_info[graphic].anim_delay = 1;
+
+  /* set mode for animation frame order */
+  if (parameter[GFX_ARG_MODE_LOOP])
+    graphic_info[graphic].anim_mode = ANIM_LOOP;
+  else if (parameter[GFX_ARG_MODE_LINEAR])
+    graphic_info[graphic].anim_mode = ANIM_LINEAR;
+  else if (parameter[GFX_ARG_MODE_PINGPONG])
+    graphic_info[graphic].anim_mode = ANIM_PINGPONG;
+  else if (parameter[GFX_ARG_MODE_PINGPONG2])
+    graphic_info[graphic].anim_mode = ANIM_PINGPONG2;
+  else if (parameter[GFX_ARG_MODE_RANDOM])
+    graphic_info[graphic].anim_mode = ANIM_RANDOM;
+  else if (graphic_info[graphic].anim_frames > 1)
+    graphic_info[graphic].anim_mode = ANIM_LOOP;
+  else
+    graphic_info[graphic].anim_mode = ANIM_NONE;
+
+  /* set additional flag to play animation frames in reverse order */
+  if (parameter[GFX_ARG_MODE_REVERSE])
+    graphic_info[graphic].anim_mode |= ANIM_REVERSE;
+
+  /* automatically determine correct start frame, if not defined */
+  if (parameter[GFX_ARG_START_FRAME] == ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].anim_start_frame = 0;
+  else if (graphic_info[graphic].anim_mode & ANIM_REVERSE)
+    graphic_info[graphic].anim_start_frame =
+      graphic_info[graphic].anim_frames - parameter[GFX_ARG_START_FRAME] - 1;
+  else
+    graphic_info[graphic].anim_start_frame = parameter[GFX_ARG_START_FRAME];
+
+  /* animation synchronized with global frame counter, not move position */
+  graphic_info[graphic].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
+
+  /* this is only used for toon animations */
+  graphic_info[graphic].step_offset = parameter[GFX_ARG_STEP_OFFSET];
+  graphic_info[graphic].step_delay  = parameter[GFX_ARG_STEP_DELAY];
+}
+
+static void InitGraphicInfo()
+{
+  static boolean clipmasks_initialized = FALSE;
+  int fallback_graphic = IMG_CHAR_EXCLAM;
+  struct FileInfo *fallback_image = getImageListEntry(fallback_graphic);
+  Bitmap *fallback_bitmap = getBitmapFromImageID(fallback_graphic);
+  int num_images = getImageListSize();
+  int i;
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  Pixmap src_pixmap;
+  XGCValues clip_gc_values;
+  unsigned long clip_gc_valuemask;
+  GC copy_clipmask_gc = None;
+#endif
+
+  if (graphic_info != NULL)
+    free(graphic_info);
+
+  graphic_info = checked_calloc(num_images * sizeof(struct GraphicInfo));
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  if (clipmasks_initialized)
+  {
+    for (i=0; i<num_images; i++)
+    {
+      if (graphic_info[i].clip_mask)
+	XFreePixmap(display, graphic_info[i].clip_mask);
+      if (graphic_info[i].clip_gc)
+	XFreeGC(display, graphic_info[i].clip_gc);
+
+      graphic_info[i].clip_mask = None;
+      graphic_info[i].clip_gc = None;
+    }
+  }
+#endif
+
+  for (i=0; i<num_images; i++)
+  {
+    struct FileInfo *image = getImageListEntry(i);
+    Bitmap *src_bitmap;
+    int src_x, src_y;
+    int first_frame, last_frame;
+
+    set_graphic_parameters(i, image->parameter);
+
+    /* now check if no animation frames are outside of the loaded image */
+
+    if (graphic_info[i].bitmap == NULL)
+      continue;		/* skip check for optional images that are undefined */
+
+    first_frame = 0;
+    getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
+    if (src_x < 0 || src_y < 0 ||
+	src_x + TILEX > src_bitmap->width ||
+	src_y + TILEY > src_bitmap->height)
+    {
+      Error(ERR_RETURN_LINE, "-");
+      Error(ERR_RETURN, "warning: error found in config file:");
+      Error(ERR_RETURN, "- config file: '%s'",
+	    getImageConfigFilename());
+      Error(ERR_RETURN, "- config token: '%s'",
+	    getTokenFromImageID(i));
+      Error(ERR_RETURN, "- image file: '%s'",
+	    src_bitmap->source_filename);
+      Error(ERR_RETURN,
+	    "error: first animation frame out of bounds (%d, %d)",
+	    src_x, src_y);
+      Error(ERR_RETURN, "custom graphic rejected for this element/action");
+
+      if (i == fallback_graphic)
+	Error(ERR_EXIT, "fatal error: no fallback graphic available");
+
+      Error(ERR_RETURN, "fallback done to 'char_exclam' for this graphic");
+      Error(ERR_RETURN_LINE, "-");
+
+      set_graphic_parameters(i, fallback_image->default_parameter);
+      graphic_info[i].bitmap = fallback_bitmap;
+    }
+
+    last_frame = graphic_info[i].anim_frames - 1;
+    getGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y);
+    if (src_x < 0 || src_y < 0 ||
+	src_x + TILEX > src_bitmap->width ||
+	src_y + TILEY > src_bitmap->height)
+    {
+      Error(ERR_RETURN_LINE, "-");
+      Error(ERR_RETURN, "warning: error found in config file:");
+      Error(ERR_RETURN, "- config file: '%s'",
+	    getImageConfigFilename());
+      Error(ERR_RETURN, "- config token: '%s'",
+	    getTokenFromImageID(i));
+      Error(ERR_RETURN, "- image file: '%s'",
+	    src_bitmap->source_filename);
+      Error(ERR_RETURN,
+	    "error: last animation frame (%d) out of bounds (%d, %d)",
+	    last_frame, src_x, src_y);
+      Error(ERR_RETURN, "custom graphic rejected for this element/action");
+
+      if (i == fallback_graphic)
+	Error(ERR_EXIT, "fatal error: no fallback graphic available");
+
+      Error(ERR_RETURN, "fallback done to 'char_exclam' for this graphic");
+      Error(ERR_RETURN_LINE, "-");
+
+      set_graphic_parameters(i, fallback_image->default_parameter);
+      graphic_info[i].bitmap = fallback_bitmap;
+    }
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+    /* currently we need only a tile clip mask from the first frame */
+    getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
+
+    if (copy_clipmask_gc == None)
+    {
+      clip_gc_values.graphics_exposures = False;
+      clip_gc_valuemask = GCGraphicsExposures;
+      copy_clipmask_gc = XCreateGC(display, src_bitmap->clip_mask,
+				   clip_gc_valuemask, &clip_gc_values);
+    }
+
+    graphic_info[i].clip_mask =
+      XCreatePixmap(display, window->drawable, TILEX, TILEY, 1);
+
+    src_pixmap = src_bitmap->clip_mask;
+    XCopyArea(display, src_pixmap, graphic_info[i].clip_mask,
+	      copy_clipmask_gc, src_x, src_y, TILEX, TILEY, 0, 0);
+
+    clip_gc_values.graphics_exposures = False;
+    clip_gc_values.clip_mask = graphic_info[i].clip_mask;
+    clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
+    graphic_info[i].clip_gc =
+      XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
+#endif
+  }
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  if (copy_clipmask_gc)
+    XFreeGC(display, copy_clipmask_gc);
+#endif
+
+  clipmasks_initialized = TRUE;
+}
+
+static void set_sound_parameters(int sound, char **parameter_raw)
+{
+  int parameter[NUM_SND_ARGS];
+  int i;
+
+  /* get integer values from string parameters */
+  for (i=0; i < NUM_SND_ARGS; i++)
+    parameter[i] =
+      get_parameter_value(sound_config_suffix[i].type, parameter_raw[i]);
+
+  /* explicit loop mode setting in configuration overrides default value */
+  if (parameter[SND_ARG_MODE_LOOP] != ARG_UNDEFINED_VALUE)
+    sound_info[sound].loop = parameter[SND_ARG_MODE_LOOP];
+}
+
+static void InitSoundInfo()
+{
+  int *sound_effect_properties;
+  int num_sounds = getSoundListSize();
+  int i, j;
+
+  if (sound_info != NULL)
+    free(sound_info);
+
+  sound_effect_properties = checked_calloc(num_sounds * sizeof(int));
+  sound_info = checked_calloc(num_sounds * sizeof(struct SoundInfo));
+
+  /* initialize sound effect for all elements to "no sound" */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+    for (j=0; j<NUM_ACTIONS; j++)
+      element_info[i].sound[j] = SND_UNDEFINED;
+
+  for (i=0; i<num_sounds; i++)
+  {
+    struct FileInfo *sound = getSoundListEntry(i);
+    int len_effect_text = strlen(sound->token);
+
+    sound_effect_properties[i] = ACTION_OTHER;
+    sound_info[i].loop = FALSE;
+
+    /* determine all loop sounds and identify certain sound classes */
+
+    for (j=0; element_action_info[j].suffix; j++)
+    {
+      int len_action_text = strlen(element_action_info[j].suffix);
+
+      if (len_action_text < len_effect_text &&
+	  strcmp(&sound->token[len_effect_text - len_action_text],
+		 element_action_info[j].suffix) == 0)
+      {
+	sound_effect_properties[i] = element_action_info[j].value;
+
+	if (element_action_info[j].is_loop_sound)
+	  sound_info[i].loop = TRUE;
+      }
+    }
+
+    /* associate elements and some selected sound actions */
+
+    for (j=0; j<MAX_NUM_ELEMENTS; j++)
+    {
+      if (element_info[j].sound_class_name)
+      {
+	int len_class_text = strlen(element_info[j].sound_class_name);
+
+	if (len_class_text + 1 < len_effect_text &&
+	    strncmp(sound->token,
+		    element_info[j].sound_class_name, len_class_text) == 0 &&
+	    sound->token[len_class_text] == '.')
+	{
+	  int sound_action_value = sound_effect_properties[i];
+
+	  element_info[j].sound[sound_action_value] = i;
+	}
+      }
+    }
+
+    set_sound_parameters(i, sound->parameter);
+  }
+
+  free(sound_effect_properties);
+
+#if 0
+  /* TEST ONLY */
+  {
+    int element = EL_SAND;
+    int sound_action = ACTION_DIGGING;
+    int j = 0;
+
+    while (element_action_info[j].suffix)
+    {
+      if (element_action_info[j].value == sound_action)
+	printf("element %d, sound action '%s'  == %d\n",
+	       element, element_action_info[j].suffix,
+	       element_info_[element].sound[sound_action]);
+      j++;
+    }
+  }
+#endif
 }
 
 void InitElementProperties()
@@ -880,54 +1224,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,
@@ -936,13 +1280,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,
@@ -952,45 +1296,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,
@@ -1009,26 +1353,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,
@@ -1041,38 +1389,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,
@@ -1081,13 +1429,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,
@@ -1097,13 +1445,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,
@@ -1115,21 +1463,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,
@@ -1142,28 +1491,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,
@@ -1172,13 +1521,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,
@@ -1188,27 +1537,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,
@@ -1217,7 +1566,7 @@ void InitElementProperties()
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
     EL_SPEED_PILL,
-    EL_STEEL_SLANTED,
+    EL_STEELWALL_SLANTED,
     EL_PEARL,
     EL_CRYSTAL
   };
@@ -1225,12 +1574,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,
@@ -1240,33 +1589,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,
@@ -1286,42 +1635,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,
@@ -1334,27 +1687,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,
@@ -1367,57 +1720,57 @@ 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,
-    EL_SPRING_MOVING
+    EL_SPRING
   };
   static int ep_can_move_num = SIZEOF_ARRAY_INT(ep_can_move);
 
   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,
@@ -1427,28 +1780,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
   };
@@ -1456,26 +1809,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
   };
@@ -1483,119 +1836,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,
@@ -1628,20 +1982,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,
@@ -1654,40 +2006,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,
@@ -1699,12 +2051,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
   };
@@ -1712,14 +2064,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,
@@ -1731,31 +2083,32 @@ 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_SP_BUGGY_BASE_ACTIVATING,
+    EL_TRAP,
+    EL_INVISIBLE_SAND,
+    EL_INVISIBLE_SAND_ACTIVE
   };
   static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable);
 
@@ -1768,7 +2121,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,
@@ -1786,7 +2140,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,
@@ -1802,7 +2156,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
   };
@@ -1810,14 +2164,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,
@@ -1847,13 +2201,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,
@@ -1864,56 +2218,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,
@@ -1958,6 +2329,7 @@ void InitElementProperties()
   static long ep2_bit[] =
   {
     EP_BIT_BELT,
+    EP_BIT_BELT_ACTIVE,
     EP_BIT_BELT_SWITCH,
     EP_BIT_TUBE
   };
@@ -1998,6 +2370,7 @@ void InitElementProperties()
   static int *ep2_array[] =
   {
     ep_belt,
+    ep_belt_active,
     ep_belt_switch,
     ep_tube
   };
@@ -2038,32 +2411,33 @@ void InitElementProperties()
   static int *ep2_num[] =
   {
     &ep_belt_num,
+    &ep_belt_active_num,
     &ep_belt_switch_num,
     &ep_tube_num
   };
   static int num_properties1 = SIZEOF_ARRAY(ep1_num, int *);
   static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *);
 
-  for(i=0; i<MAX_ELEMENTS; i++)
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    Elementeigenschaften1[i] = 0;
-    Elementeigenschaften2[i] = 0;
+    Properties1[i] = 0;
+    Properties2[i] = 0;
   }
 
-  for(i=0; i<num_properties1; i++)
-    for(j=0; j<*(ep1_num[i]); j++)
-      Elementeigenschaften1[(ep1_array[i])[j]] |= ep1_bit[i];
-  for(i=0; i<num_properties2; i++)
-    for(j=0; j<*(ep2_num[i]); j++)
-      Elementeigenschaften2[(ep2_array[i])[j]] |= ep2_bit[i];
+  for (i=0; i<num_properties1; i++)
+    for (j=0; j<*(ep1_num[i]); j++)
+      Properties1[(ep1_array[i])[j]] |= ep1_bit[i];
+  for (i=0; i<num_properties2; i++)
+    for (j=0; j<*(ep2_num[i]); j++)
+      Properties2[(ep2_array[i])[j]] |= ep2_bit[i];
 
-  for(i=EL_CHAR_START; i<=EL_CHAR_END; i++)
-    Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
+  for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
+    Properties1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
 }
 
-void Execute_Debug_Command(char *command)
+void Execute_Command(char *command)
 {
-  if (strcmp(command, "create graphicsinfo.conf") == 0)
+  if (strcmp(command, "print graphicsinfo.conf") == 0)
   {
     int i;
 
@@ -2075,12 +2449,14 @@ 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));
+
+    exit(0);
   }
-  else if (strcmp(command, "create soundsinfo.conf") == 0)
+  else if (strcmp(command, "print soundsinfo.conf") == 0)
   {
     int i;
 
@@ -2092,40 +2468,79 @@ 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));
+
+    exit(0);
   }
-  else if (strcmp(command, "create musicinfo.conf") == 0)
+  else if (strcmp(command, "print musicinfo.conf") == 0)
   {
     printf("# (Currently only \"name\" and \"sort_priority\" recognized.)\n");
     printf("\n");
     printf("%s\n", getFormattedSetupEntry("name", "Classic Music"));
     printf("\n");
     printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+
+    exit(0);
+  }
+  else if (strncmp(command, "dump level ", 11) == 0)
+  {
+    char *filename = &command[11];
+
+    if (access(filename, F_OK) != 0)
+      Error(ERR_EXIT, "cannot open file '%s'", filename);
+
+    LoadLevelFromFilename(filename);
+    DumpLevel(&level);
+
+    exit(0);
   }
-  else if (strcmp(command, "help") == 0)
+  else if (strncmp(command, "dump tape ", 10) == 0)
   {
-    printf("The following commands are recognized:\n");
-    printf("   \"create graphicsinfo.conf\"\n");
-    printf("   \"create soundsinfo.conf\"\n");
-    printf("   \"create musicinfo.conf\"\n");
+    char *filename = &command[10];
+
+    if (access(filename, F_OK) != 0)
+      Error(ERR_EXIT, "cannot open file '%s'", filename);
+
+    LoadTapeFromFilename(filename);
+    DumpTape(&tape);
+
+    exit(0);
+  }
+  else if (strncmp(command, "autoplay ", 9) == 0)
+  {
+    char *str_copy = getStringCopy(&command[9]);
+    char *str_ptr = strchr(str_copy, ' ');
+
+    global.autoplay_leveldir = str_copy;
+    global.autoplay_level_nr = -1;
+
+    if (str_ptr != NULL)
+    {
+      *str_ptr++ = '\0';			/* terminate leveldir string */
+      global.autoplay_level_nr = atoi(str_ptr);	/* get level_nr value */
+    }
+  }
+  else
+  {
+    Error(ERR_EXIT_HELP, "unrecognized command '%s'", command);
   }
 }
 
 void CloseAllAndExit(int exit_value)
 {
-  int i;
-
   StopSounds();
   FreeAllSounds();
   FreeAllMusic();
   CloseAudio();		/* called after freeing sounds (needed for SDL) */
 
+  FreeAllImages();
   FreeTileClipmasks();
-  for(i=0; i<NUM_BITMAPS; i++)
-    FreeBitmap(pix[i]);
+
+  if (bitmap_font_initial)
+    FreeBitmap(bitmap_font_initial);
 
   CloseVideoDisplay();
   ClosePlatformDependantStuff();