X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=08069f4afa83dd1d9c217157411b20b15ba3c19d;hb=5a5342a6ab48037839b783adc4f3304331834a8c;hp=040270a1b844941f1c37a59d4a5a904128b1d6ad;hpb=ab9b68feafe2cf6012533e5ad0581e6b9d423959;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 040270a1..b24944ee 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,96 +1,145 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2002 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  init.c                                                  *
+* init.c                                                   *
 ***********************************************************/
 
-#include <signal.h>
+#include "libgame/libgame.h"
 
 #include "init.h"
 #include "events.h"
-#include "misc.h"
-#include "sound.h"
 #include "screens.h"
 #include "editor.h"
 #include "game.h"
 #include "tape.h"
 #include "tools.h"
 #include "files.h"
-#include "joystick.h"
-#include "image.h"
-#include "pcx.h"
 #include "network.h"
 #include "netserv.h"
-
-struct PictureFileInfo
-{
-  char *picture_filename;
-  boolean picture_with_mask;
-};
-
-static void InitPlayerInfo(void);
-static void InitLevelInfo(void);
-static void InitNetworkServer(void);
-static void InitSound(void);
-static void InitSoundServer(void);
-static void InitGfx(void);
-static void InitGfxBackground(void);
-static void LoadGfx(int, struct PictureFileInfo *);
-static void InitGadgets(void);
-static void InitElementProperties(void);
-
-void OpenAll(int argc, char *argv[])
+#include "cartoons.h"
+#include "config.h"
+
+#include "conf_e2g.c"	/* include auto-generated data structure definitions */
+#include "conf_esg.c"	/* include auto-generated data structure definitions */
+#include "conf_fnt.c"	/* include auto-generated data structure definitions */
+
+#define CONFIG_TOKEN_FONT_INITIAL		"font.initial"
+
+struct FontBitmapInfo font_initial[NUM_INITIAL_FONTS];
+
+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 InitFontGraphicInfo();
+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()
 {
-#if !defined(PLATFORM_UNIX)
-  initErrorFile();
-#endif
+  InitGlobal();		/* initialize some global variables */
+
+  if (options.execute_command)
+    Execute_Command(options.execute_command);
 
   if (options.serveronly)
   {
 #if defined(PLATFORM_UNIX)
     NetworkServer(options.server_port, options.serveronly);
 #else
-    Error(ERR_WARN, "networking not supported in Windows version");
+    Error(ERR_WARN, "networking only supported in Unix version");
 #endif
-
-    /* never reached */
-    exit(0);
+    exit(0);	/* never reached */
   }
 
+  InitProgramInfo(UNIX_USERDATA_DIRECTORY,
+		  PROGRAM_TITLE_STRING, getWindowTitleString(),
+		  ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME,
+		  MSDOS_POINTER_FILENAME,
+		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
+
+  InitSetup();
   InitPlayerInfo();
+  InitArtworkInfo();		/* needed before loading gfx, sound & music */
+  InitArtworkConfig();		/* needed before forking sound child process */
+  InitMixer();
 
   InitCounter();
-  InitSound();
-  InitSoundServer();
+
   InitJoysticks();
   InitRND(NEW_RANDOMIZE);
 
-  signal(SIGINT, CloseAllAndExit);
-  signal(SIGTERM, CloseAllAndExit);
+  InitVideoDisplay();
+  InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH,
+		  setup.fullscreen);
 
-  InitBufferedDisplay(&backbuffer, &window);
   InitEventFilter(FilterMouseMotionEvents);
 
+  InitElementProperties();
+
   InitGfx();
-  InitElementProperties();	/* initializes IS_CHAR() for el2gfx() */
 
   InitLevelInfo();
-  InitGadgets();		/* needs to know number of level series */
+  InitLevelArtworkInfo();
+
+  InitImages();			/* needs to know current level directory */
+  InitSound();			/* needs to know current level directory */
+  InitMusic();			/* needs to know current level directory */
 
   InitGfxBackground();
+
+  if (global.autoplay_leveldir)
+  {
+    AutoPlayTape();
+    return;
+  }
+
+  game_status = MAINMENU;
+
   DrawMainMenu();
 
   InitNetworkServer();
 }
 
-void InitPlayerInfo()
+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 */
+}
+
+static void InitPlayerInfo()
 {
   int i;
 
@@ -98,23 +147,77 @@ void InitPlayerInfo()
   local_player = &stored_player[0];
 
   for (i=0; i<MAX_PLAYERS; i++)
-  {
-    stored_player[i].joystick_fd = -1;	/* joystick device closed */
     stored_player[i].connected = FALSE;
-  }
 
   local_player->connected = TRUE;
-
-  LoadSetup();					/* global setup info */
 }
 
-void InitLevelInfo()
+static void InitLevelInfo()
 {
   LoadLevelInfo();				/* global level info */
   LoadLevelSetup_LastSeries();			/* last played series info */
   LoadLevelSetup_SeriesInfo();			/* last played level info */
 }
 
+static void InitArtworkInfo()
+{
+  LoadArtworkInfo();
+}
+
+static void InitArtworkConfig()
+{
+  static char *image_id_prefix[MAX_NUM_ELEMENTS + NUM_FONTS + 1];
+  static char *sound_id_prefix[MAX_NUM_ELEMENTS + 1];
+  static char *action_id_suffix[NUM_ACTIONS + 1];
+  static char *direction_id_suffix[NUM_DIRECTIONS + 1];
+  static char *special_id_suffix[NUM_SPECIAL_GFX_ARGS + 1];
+  static char *dummy[1] = { NULL };
+  static char *ignore_image_tokens[] =
+  {
+    "name",
+    "sort_priority",
+    "menu.main.hide_static_text",
+    "global.num_toons",
+    NULL
+  };
+  static char *ignore_sound_tokens[] =
+  {
+    "name",
+    "sort_priority",
+    NULL
+  };
+  int i;
+
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+    image_id_prefix[i] = element_info[i].token_name;
+  for (i=0; i<NUM_FONTS + 1; i++)
+    image_id_prefix[MAX_NUM_ELEMENTS + i] = font_info[i].token_name;
+
+  for (i=0; i<MAX_NUM_ELEMENTS + 1; i++)
+    sound_id_prefix[i] = element_info[i].sound_class_name;
+
+  for (i=0; i<NUM_ACTIONS + 1; i++)
+    action_id_suffix[i] = element_action_info[i].suffix;
+
+  for (i=0; i<NUM_DIRECTIONS + 1; i++)
+    direction_id_suffix[i] = element_direction_info[i].suffix;
+
+  for (i=0; i<NUM_SPECIAL_GFX_ARGS + 1; i++)
+    special_id_suffix[i] = special_suffix_info[i].suffix;
+
+  InitImageList(image_config, NUM_IMAGE_FILES, image_config_suffix,
+		image_id_prefix, action_id_suffix, direction_id_suffix,
+		special_id_suffix, ignore_image_tokens);
+  InitSoundList(sound_config, NUM_SOUND_FILES, sound_config_suffix,
+		sound_id_prefix, action_id_suffix, dummy,
+		dummy, ignore_sound_tokens);
+}
+
+void InitLevelArtworkInfo()
+{
+  LoadLevelArtworkInfo();
+}
+
 void InitNetworkServer()
 {
 #if defined(PLATFORM_UNIX)
@@ -138,602 +241,1331 @@ void InitNetworkServer()
 #endif
 }
 
-void InitSound()
+static void InitMixer()
+{
+  OpenAudio();
+  StartMixer();
+}
+
+static void ReinitializeGraphics()
+{
+  InitElementGraphicInfo();		/* element game graphic mapping */
+  InitElementSpecialGraphicInfo();	/* element special graphic mapping */
+  InitGraphicInfo();			/* graphic properties mapping */
+
+  InitElementSmallImages();		/* create editor and preview images */
+  InitFontGraphicInfo();		/* initialize text drawing functions */
+
+  SetMainBackgroundImage(IMG_BACKGROUND);
+  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
+
+  InitGadgets();
+  InitToons();
+}
+
+static void ReinitializeSounds()
+{
+  InitElementSoundInfo();	/* element game sound mapping */
+  InitSoundInfo();		/* sound properties mapping */
+
+  InitPlaySoundLevel();		/* internal game sound settings */
+}
+
+static void ReinitializeMusic()
+{
+  /* currently nothing to do */
+}
+
+static void InitImages()
+{
+  ReloadCustomImages();
+
+  LoadCustomElementDescriptions();
+  LoadSpecialMenuDesignSettings();
+
+  ReinitializeGraphics();
+}
+
+static void InitSound()
+{
+  InitReloadCustomSounds(artwork.snd_current->identifier);
+  ReinitializeSounds();
+}
+
+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
+  {
+    int start;
+    int count;
+  }
+  tile_needs_clipping[] =
+  {
+    { GFX_SPIELER1_UP, 4 },
+    { GFX_SPIELER1_DOWN, 4 },
+    { GFX_SPIELER1_LEFT, 4 },
+    { GFX_SPIELER1_RIGHT, 4 },
+    { GFX_SPIELER1_PUSH_LEFT, 4 },
+    { GFX_SPIELER1_PUSH_RIGHT, 4 },
+    { GFX_SPIELER2_UP, 4 },
+    { GFX_SPIELER2_DOWN, 4 },
+    { GFX_SPIELER2_LEFT, 4 },
+    { GFX_SPIELER2_RIGHT, 4 },
+    { GFX_SPIELER2_PUSH_LEFT, 4 },
+    { GFX_SPIELER2_PUSH_RIGHT, 4 },
+    { GFX_SPIELER3_UP, 4 },
+    { GFX_SPIELER3_DOWN, 4 },
+    { GFX_SPIELER3_LEFT, 4 },
+    { GFX_SPIELER3_RIGHT, 4 },
+    { GFX_SPIELER3_PUSH_LEFT, 4 },
+    { GFX_SPIELER3_PUSH_RIGHT, 4 },
+    { GFX_SPIELER4_UP, 4 },
+    { GFX_SPIELER4_DOWN, 4 },
+    { GFX_SPIELER4_LEFT, 4 },
+    { GFX_SPIELER4_RIGHT, 4 },
+    { GFX_SPIELER4_PUSH_LEFT, 4 },
+    { GFX_SPIELER4_PUSH_RIGHT, 4 },
+    { GFX_SP_MURPHY, 1 },
+    { GFX_MURPHY_GO_LEFT, 3 },
+    { GFX_MURPHY_GO_RIGHT, 3 },
+    { GFX_MURPHY_SNAP_UP, 1 },
+    { GFX_MURPHY_SNAP_DOWN, 1 },
+    { GFX_MURPHY_SNAP_RIGHT, 1 },
+    { GFX_MURPHY_SNAP_LEFT, 1 },
+    { GFX_MURPHY_PUSH_RIGHT, 1 },
+    { GFX_MURPHY_PUSH_LEFT, 1 },
+    { GFX_GEBLUBBER, 4 },
+    { GFX_DYNAMIT, 7 },
+    { GFX_DYNABOMB, 4 },
+    { GFX_EXPLOSION, 8 },
+    { GFX_SOKOBAN_OBJEKT, 1 },
+    { GFX_FUNKELN_BLAU, 3 },
+    { GFX_FUNKELN_WEISS, 3 },
+    { GFX2_SHIELD_PASSIVE, 3 },
+    { 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++)
+    tile_clipmask[i] = None;
+
+#if defined(TARGET_X11)
+  /* This stuff is needed because X11 (XSetClipOrigin(), to be precise) is
+     often very slow when preparing a masked XCopyArea() for big Pixmaps.
+     To prevent this, create small (tile-sized) mask Pixmaps which will then
+     be set much faster with XSetClipOrigin() and speed things up a lot. */
+
+  clip_gc_values.graphics_exposures = False;
+  clip_gc_valuemask = GCGraphicsExposures;
+  tile_clip_gc = XCreateGC(display, window->drawable,
+			   clip_gc_valuemask, &clip_gc_values);
+
+#if 0
+  for (i=0; i<NUM_BITMAPS; i++)
+  {
+    if (pix[i]->clip_mask)
+    {
+      clip_gc_values.graphics_exposures = False;
+      clip_gc_values.clip_mask = pix[i]->clip_mask;
+      clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
+      pix[i]->stored_clip_gc = XCreateGC(display, window->drawable,
+					 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;
+  copy_clipmask_gc = XCreateGC(display, pix[PIX_BACK]->clip_mask,
+			       clip_gc_valuemask, &clip_gc_values);
+
+  /* create only those clipping Pixmaps we really need */
+  for (i=0; tile_needs_clipping[i].start>=0; i++)
+  {
+    int 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;
+      Bitmap *src_bitmap;
+      Pixmap src_pixmap;
+
+      getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+      src_pixmap = src_bitmap->clip_mask;
+
+      tile_clipmask[tile] = XCreatePixmap(display, window->drawable,
+					  TILEX, TILEY, 1);
+
+      XCopyArea(display, src_pixmap, tile_clipmask[tile], copy_clipmask_gc,
+		src_x, src_y, TILEX, TILEY, 0, 0);
+    }
+  }
+
+  XFreeGC(display, copy_clipmask_gc);
+#endif
+
+#endif /* TARGET_X11_NATIVE */
+#endif /* TARGET_X11 */
+#endif
+}
+
+void FreeTileClipmasks()
 {
+#if 0
+#if defined(TARGET_X11)
   int i;
 
-  audio = InitAudio();
+  for (i=0; i<NUM_TILES; i++)
+  {
+    if (tile_clipmask[i] != None)
+    {
+      XFreePixmap(display, tile_clipmask[i]);
+      tile_clipmask[i] = None;
+    }
+  }
+
+  if (tile_clip_gc)
+    XFreeGC(display, tile_clip_gc);
+  tile_clip_gc = None;
 
-  for(i=0; i<NUM_SOUNDS; i++)
+#if 0
+  for (i=0; i<NUM_BITMAPS; i++)
   {
-    Sound[i].name = sound_name[i];
+    if (pix[i] != NULL && pix[i]->stored_clip_gc)
+    {
+      XFreeGC(display, pix[i]->stored_clip_gc);
+      pix[i]->stored_clip_gc = None;
+    }
+  }
+#endif
+
+#endif /* TARGET_X11 */
+#endif
+}
+
+void InitGfx()
+{
+  char *filename_font_initial = NULL;
+  Bitmap *bitmap_font_initial = NULL;
+  int i, j;
 
-    if (!LoadSound(&Sound[i]))
+  /* determine settings for initial font (for displaying startup messages) */
+  for (i=0; image_config[i].token != NULL; i++)
+  {
+    for (j=0; j < NUM_INITIAL_FONTS; j++)
     {
-      audio.sound_available = FALSE;
-      audio.loops_available = FALSE;
-      return;
+      char font_token[128];
+      int len_font_token;
+
+      sprintf(font_token, "%s_%d", CONFIG_TOKEN_FONT_INITIAL, j + 1);
+      len_font_token = strlen(font_token);
+
+      if (strcmp(image_config[i].token, font_token) == 0)
+	filename_font_initial = image_config[i].value;
+      else if (strlen(image_config[i].token) > len_font_token &&
+	       strncmp(image_config[i].token, font_token, len_font_token) == 0)
+      {
+	if (strcmp(&image_config[i].token[len_font_token], ".x") == 0)
+	  font_initial[j].src_x = atoi(image_config[i].value);
+	else if (strcmp(&image_config[i].token[len_font_token], ".y") == 0)
+	  font_initial[j].src_y = atoi(image_config[i].value);
+	else if (strcmp(&image_config[i].token[len_font_token], ".width") == 0)
+	  font_initial[j].width = atoi(image_config[i].value);
+	else if (strcmp(&image_config[i].token[len_font_token],".height") == 0)
+	  font_initial[j].height = atoi(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,
+		   REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
+  InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE);
+  InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE);
+  InitGfxScrollbufferInfo(FXSIZE, FYSIZE);
+
+  /* create additional image buffers for double-buffering */
+  bitmap_db_field = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
+  bitmap_db_door  = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
+
+  bitmap_font_initial = LoadCustomImage(filename_font_initial);
+
+  for (j=0; j < NUM_INITIAL_FONTS; j++)
+    font_initial[j].bitmap = bitmap_font_initial;
+
+  InitFontGraphicInfo();
+
+  DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
+  DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
+
+  DrawInitText("Loading graphics:", 120, FC_GREEN);
+
+  InitTileClipmasks();
 }
 
-void InitSoundServer()
+void InitGfxBackground()
 {
-  if (!audio.sound_available)
+  int x, y;
+
+  drawto = backbuffer;
+  fieldbuffer = bitmap_db_field;
+  SetDrawtoField(DRAW_BACKBUFFER);
+
+  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(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++)
+      redraw[x][y] = 0;
+  redraw_tiles = 0;
+  redraw_mask = REDRAW_ALL;
+}
+
+void ReloadCustomArtwork()
+{
+  static char *leveldir_current_identifier = NULL;
+  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",
+	 artwork.gfx_current_identifier, artwork.gfx_current->filename);
+  printf("sounds   --> '%s' ('%s')\n",
+	 artwork.snd_current_identifier, artwork.snd_current->filename);
+  printf("music    --> '%s' ('%s')\n",
+	 artwork.mus_current_identifier, artwork.mus_current->filename);
+#endif
+
+  /* leveldir_current may be invalid (level group, parent link) */
+  if (!validLevelSeries(leveldir_current))
     return;
 
-#if !defined(TARGET_SDL)
-#if defined(PLATFORM_UNIX)
+  /* 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)
+  {
+    char *identifier_old = leveldir_current_identifier;
+    char *identifier_new = leveldir_current->identifier;
+
+    if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old) !=
+	getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new))
+      gfx_new_identifier = identifier_new;
+    if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_old) !=
+	getTreeInfoFromIdentifier(artwork.snd_first, identifier_new))
+      snd_new_identifier = identifier_new;
+    if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new) !=
+	getTreeInfoFromIdentifier(artwork.mus_first, identifier_new))
+      mus_new_identifier = identifier_new;
+
+    leveldir_current_identifier = leveldir_current->identifier;
+  }
 
-  if (pipe(audio.soundserver_pipe) < 0)
+  /* custom level artwork configured in level series configuration file
+     always overrides custom level artwork stored in level series directory
+     and (level independant) custom artwork configured in setup menue */
+  if (leveldir_current->graphics_set != NULL)
+    gfx_new_identifier = leveldir_current->graphics_set;
+  if (leveldir_current->sounds_set != NULL)
+    snd_new_identifier = leveldir_current->sounds_set;
+  if (leveldir_current->music_set != NULL)
+    mus_new_identifier = leveldir_current->music_set;
+
+  if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 ||
+      last_override_level_graphics != setup.override_level_graphics)
   {
-    Error(ERR_WARN, "cannot create pipe - no sounds");
-    audio.sound_available = FALSE;
-    return;
+#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);
+
+    InitImages();
+
+    FreeTileClipmasks();
+    InitTileClipmasks();
+
+    artwork.gfx_current_identifier = artwork.gfx_current->identifier;
+    last_override_level_graphics = setup.override_level_graphics;
+
+    redraw_screen = TRUE;
   }
 
-  if ((audio.soundserver_pid = fork()) < 0)
-  {       
-    Error(ERR_WARN, "cannot create sound server process - no sounds");
-    audio.sound_available = FALSE;
-    return;
+  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);
+
+    InitReloadCustomSounds(snd_new_identifier);
+    ReinitializeSounds();
+
+    artwork.snd_current_identifier = artwork.snd_current->identifier;
+    last_override_level_sounds = setup.override_level_sounds;
+
+    redraw_screen = TRUE;
   }
 
-  if (audio.soundserver_pid == 0)	/* we are child */
+  if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 ||
+      last_override_level_music != setup.override_level_music)
   {
-    SoundServer();
+    /* set artwork path to send it to the sound server process */
+    setLevelArtworkDir(artwork.mus_first);
 
-    /* never reached */
-    exit(0);
+    InitReloadCustomMusic(mus_new_identifier);
+    ReinitializeMusic();
+
+    artwork.mus_current_identifier = artwork.mus_current->identifier;
+    last_override_level_music = setup.override_level_music;
+
+    redraw_screen = TRUE;
   }
-  else					/* we are parent */
-    close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
 
-#else /* !PLATFORM_UNIX */
+  if (redraw_screen)
+  {
+    InitGfxBackground();
 
-  SoundServer();
+    /* force redraw of (open or closed) door graphics */
+    SetDoorState(DOOR_OPEN_ALL);
+    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
+  }
+}
 
-#endif /* !PLATFORM_UNIX */
-#endif /* !TARGET_SDL */
+void FreeGadgets()
+{
+  FreeLevelEditorGadgets();
+  FreeGameButtons();
+  FreeTapeButtons();
+  FreeToolButtons();
+  FreeScreenGadgets();
 }
 
-void InitJoysticks()
+void InitGadgets()
 {
-#if defined(TARGET_SDL)
-  static boolean sdl_joystick_subsystem_initialized = FALSE;
-#endif
+  static boolean gadgets_initialized = FALSE;
+
+  if (gadgets_initialized)
+    FreeGadgets();
 
+  CreateLevelEditorGadgets();
+  CreateGameButtons();
+  CreateTapeButtons();
+  CreateToolButtons();
+  CreateScreenGadgets();
+
+  gadgets_initialized = TRUE;
+}
+
+void InitElementSmallImages()
+{
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
   int i;
 
-  if (global_joystick_status == JOYSTICK_OFF)
-    return;
+  /* 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++)
+    if (property_mapping[i].artwork_index < MAX_NUM_ELEMENTS)
+      CreateImageWithSmallImages(property_mapping[i].artwork_index);
+}
+
+static int getFontBitmapID(int font_nr)
+{
+  int special = -1;
+
+  if (game_status == MAINMENU || game_status == TYPENAME)
+    special = GFX_SPECIAL_ARG_MAIN;
+  else if (game_status == CHOOSELEVEL)
+    special = GFX_SPECIAL_ARG_LEVELS;
+  else if (game_status == HALLOFFAME)
+    special = GFX_SPECIAL_ARG_SCORES;
+  else if (game_status == LEVELED)
+    special = GFX_SPECIAL_ARG_EDITOR;
+  else if (game_status == HELPSCREEN)
+    special = GFX_SPECIAL_ARG_INFO;
+  else if (game_status == SETUP)
+    special = GFX_SPECIAL_ARG_SETUP;
+  else if (game_status == PSEUDO_PREVIEW)
+    special = GFX_SPECIAL_ARG_PREVIEW;
+  else if (game_status == PLAYING || game_status == PSEUDO_DOOR)
+    special = GFX_SPECIAL_ARG_DOOR;
+
+  if (special != -1)
+    return font_info[font_nr].special_bitmap_id[special];
+  else
+    return font_nr;
+}
+
+void InitFontGraphicInfo()
+{
+  static struct FontBitmapInfo *font_bitmap_info = NULL;
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
+  int num_font_bitmaps = NUM_FONTS;
+  int i, j;
+
+  if (graphic_info == NULL)		/* still at startup phase */
+  {
+    InitFontInfo(font_initial, NUM_INITIAL_FONTS, getFontBitmapID);
+
+    return;
+  }
+
+  /* ---------- initialize font graphic definitions ---------- */
+
+  /* always start with reliable default values (normal font graphics) */
+  for (i=0; i < NUM_FONTS; i++)
+    font_info[i].graphic = FONT_INITIAL_1;
+
+  /* initialize normal font/graphic mapping from static configuration */
+  for (i=0; font_to_graphic[i].font_nr > -1; i++)
+  {
+    int font_nr = font_to_graphic[i].font_nr;
+    int special = font_to_graphic[i].special;
+    int graphic = font_to_graphic[i].graphic;
+
+    if (special != -1)
+      continue;
+
+    font_info[font_nr].graphic = graphic;
+  }
+
+  /* always start with reliable default values (special font graphics) */
+  for (i=0; i < NUM_FONTS; i++)
+  {
+    for (j=0; j < NUM_SPECIAL_GFX_ARGS; j++)
+    {
+      font_info[i].special_graphic[j] = font_info[i].graphic;
+      font_info[i].special_bitmap_id[j] = i;
+    }
+  }
+
+  /* initialize special font/graphic mapping from static configuration */
+  for (i=0; font_to_graphic[i].font_nr > -1; i++)
+  {
+    int font_nr = font_to_graphic[i].font_nr;
+    int special = font_to_graphic[i].special;
+    int graphic = font_to_graphic[i].graphic;
+
+    if (special >= 0 && special < NUM_SPECIAL_GFX_ARGS)
+    {
+      font_info[font_nr].special_graphic[special] = graphic;
+      font_info[font_nr].special_bitmap_id[special] = num_font_bitmaps;
+      num_font_bitmaps++;
+    }
+  }
+
+  /* initialize special element/graphic mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
+  {
+    int font_nr = property_mapping[i].base_index - MAX_NUM_ELEMENTS;
+    int special = property_mapping[i].ext3_index;
+    int graphic = property_mapping[i].artwork_index;
+
+    if (font_nr < 0)
+      continue;
+
+    if (special >= 0 && special < NUM_SPECIAL_GFX_ARGS)
+    {
+      font_info[font_nr].special_graphic[special] = graphic;
+      font_info[font_nr].special_bitmap_id[special] = num_font_bitmaps;
+      num_font_bitmaps++;
+    }
+  }
+
+  /* ---------- initialize font bitmap array ---------- */
+
+  if (font_bitmap_info != NULL)
+    free(font_bitmap_info);
+
+  font_bitmap_info =
+    checked_calloc(num_font_bitmaps * sizeof(struct FontBitmapInfo));
+
+  /* ---------- initialize font bitmap definitions ---------- */
+
+  for (i=0; i < NUM_FONTS; i++)
+  {
+    if (i < NUM_INITIAL_FONTS)
+    {
+      font_bitmap_info[i] = font_initial[i];
+      continue;
+    }
+
+    for (j=0; j < NUM_SPECIAL_GFX_ARGS; j++)
+    {
+      int font_bitmap_id = font_info[i].special_bitmap_id[j];
+      int graphic = font_info[i].special_graphic[j];
+
+      /* copy font relevant information from graphics information */
+      font_bitmap_info[font_bitmap_id].bitmap = graphic_info[graphic].bitmap;
+      font_bitmap_info[font_bitmap_id].src_x  = graphic_info[graphic].src_x;
+      font_bitmap_info[font_bitmap_id].src_y  = graphic_info[graphic].src_y;
+      font_bitmap_info[font_bitmap_id].width  = graphic_info[graphic].width;
+      font_bitmap_info[font_bitmap_id].height = graphic_info[graphic].height;
+      font_bitmap_info[font_bitmap_id].draw_x = graphic_info[graphic].draw_x;
+      font_bitmap_info[font_bitmap_id].draw_y = graphic_info[graphic].draw_y;
+    }
+  }
 
-  joystick_status = JOYSTICK_OFF;
+  InitFontInfo(font_bitmap_info, num_font_bitmaps, getFontBitmapID);
+}
 
-#if defined(TARGET_SDL)
+void InitElementGraphicInfo()
+{
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
+  int i, act, dir;
 
-  if (!sdl_joystick_subsystem_initialized)
+  /* set values to -1 to identify later as "uninitialized" values */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    sdl_joystick_subsystem_initialized = TRUE;
-
-    if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
+    for (act=0; act<NUM_ACTIONS; act++)
     {
-      Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
-      return;
+      element_info[i].graphic[act] = -1;
+
+      for (dir=0; dir<NUM_DIRECTIONS; dir++)
+	element_info[i].direction_graphic[act][dir] = -1;
     }
   }
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  /* initialize normal element/graphic mapping from static configuration */
+  for (i=0; element_to_graphic[i].element > -1; i++)
   {
-    char *device_name = setup.input[i].joy.device_name;
-    int joystick_nr = getJoystickNrFromDeviceName(device_name);
-
-    if (joystick_nr >= SDL_NumJoysticks())
-      joystick_nr = -1;
-
-    /* misuse joystick file descriptor variable to store joystick number */
-    stored_player[i].joystick_fd = joystick_nr;
+    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;
+
+    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 allows subsequent calls to 'InitJoysticks' for re-initialization */
-    if (Check_SDL_JoystickOpened(joystick_nr))
-      Close_SDL_Joystick(joystick_nr);
+  /* initialize normal element/graphic mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
+  {
+    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 (!setup.input[i].use_joystick)
+    if (element >= MAX_NUM_ELEMENTS || special != -1)
       continue;
 
-    if (!Open_SDL_Joystick(joystick_nr))
-    {
-      Error(ERR_WARN, "cannot open joystick %d", joystick_nr);
-      continue;
-    }
+    if (action < 0)
+      action = ACTION_DEFAULT;
 
-    joystick_status = JOYSTICK_AVAILABLE;
+    if (direction > -1)
+      element_info[element].direction_graphic[action][direction] = graphic;
+    else
+      element_info[element].graphic[action] = graphic;
   }
 
-#else /* !TARGET_SDL */
-
-#if defined(PLATFORM_UNIX)
-  for (i=0; i<MAX_PLAYERS; i++)
+  /* now set all '-1' values to element specific default values */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    char *device_name = setup.input[i].joy.device_name;
-
-    /* this allows subsequent calls to 'InitJoysticks' for re-initialization */
-    if (stored_player[i].joystick_fd != -1)
-    {
-      close(stored_player[i].joystick_fd);
-      stored_player[i].joystick_fd = -1;
-    }
+    int default_action_graphic = element_info[i].graphic[ACTION_DEFAULT];
+    int default_action_direction_graphic[NUM_DIRECTIONS];
 
-    if (!setup.input[i].use_joystick)
-      continue;
+    if (default_action_graphic == -1)
+      default_action_graphic = IMG_CHAR_QUESTION;
 
-    if (access(device_name, R_OK) != 0)
+    for (dir=0; dir<NUM_DIRECTIONS; dir++)
     {
-      Error(ERR_WARN, "cannot access joystick device '%s'", device_name);
-      continue;
+      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;
     }
 
-    if ((stored_player[i].joystick_fd = open(device_name, O_RDONLY)) < 0)
+    for (act=0; act<NUM_ACTIONS; act++)
     {
-      Error(ERR_WARN, "cannot open joystick device '%s'", device_name);
-      continue;
+      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;
     }
-
-    joystick_status = JOYSTICK_AVAILABLE;
   }
 
-#else /* !PLATFORM_UNIX */
+#if 0
+#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
+}
 
-  /* try to access two joysticks; if that fails, try to access just one */
-  if (install_joystick(JOY_TYPE_2PADS) == 0 ||
-      install_joystick(JOY_TYPE_AUTODETECT) == 0)
-    joystick_status = JOYSTICK_AVAILABLE;
+void InitElementSpecialGraphicInfo()
+{
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
+  int i, j;
 
-  /*
-  load_joystick_data(JOYSTICK_FILENAME);
-  */
+  /* always start with reliable default values */
+  for (i=0; i < MAX_NUM_ELEMENTS; i++)
+    for (j=0; j < NUM_SPECIAL_GFX_ARGS; j++)
+      element_info[i].special_graphic[j] =
+	element_info[i].graphic[ACTION_DEFAULT];
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  /* initialize special element/graphic mapping from static configuration */
+  for (i=0; element_to_special_graphic[i].element > -1; i++)
   {
-    char *device_name = setup.input[i].joy.device_name;
-    int joystick_nr = getJoystickNrFromDeviceName(device_name);
+    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;
 
-    if (joystick_nr >= num_joysticks)
-      joystick_nr = -1;
+    if (base_redefined && !special_redefined)
+      continue;
 
-    /* misuse joystick file descriptor variable to store joystick number */
-    stored_player[i].joystick_fd = joystick_nr;
+    element_info[element].special_graphic[special] = graphic;
   }
-#endif
 
-#endif /* !TARGET_SDL */
-}
+  /* 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;
 
-void InitGfx()
-{
-  int i, j;
+    if (element >= MAX_NUM_ELEMENTS)
+      continue;
 
-#if defined(TARGET_SDL)
-  SDL_Surface *sdl_image_tmp;
-#else
-  GC copy_clipmask_gc;
-  XGCValues clip_gc_values;
-  unsigned long clip_gc_valuemask;
-#endif
+    if (special >= 0 && special < NUM_SPECIAL_GFX_ARGS)
+      element_info[element].special_graphic[special] = graphic;
+  }
+}
 
-#if !defined(PLATFORM_MSDOS)
-  static struct PictureFileInfo pic[NUM_PICTURES] =
-  {
-    { "RocksScreen",	TRUE },
-    { "RocksDoor",	TRUE },
-    { "RocksHeroes",	TRUE },
-    { "RocksToons",	TRUE },
-    { "RocksSP",	TRUE },
-    { "RocksDC",	TRUE },
-    { "RocksMore",	TRUE },
-    { "RocksFont",	FALSE },
-    { "RocksFont2",	FALSE },
-    { "RocksFont3",	FALSE }
-  }; 
-#else
-  static struct PictureFileInfo pic[NUM_PICTURES] =
-  {
-    { "Screen",	TRUE },
-    { "Door",	TRUE },
-    { "Heroes",	TRUE },
-    { "Toons",	TRUE },
-    { "SP",	TRUE },
-    { "DC",	TRUE },
-    { "More",	TRUE },
-    { "Font",	FALSE },
-    { "Font2",	FALSE },
-    { "Font3",	FALSE }
-  }; 
-#endif
+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;
 
-  static struct
+  /* get integer values from string parameters */
+  for (i=0; i < NUM_GFX_ARGS; i++)
+    parameter[i] =
+      get_parameter_value(image_config_suffix[i].token, parameter_raw[i],
+			  image_config_suffix[i].type);
+
+  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 */
   {
-    int start;
-    int count;
+    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;
   }
-  tile_needs_clipping[] =
+  else					/* frames are ordered horizontally */
   {
-    { GFX_SPIELER1_UP, 4 },
-    { GFX_SPIELER1_DOWN, 4 },
-    { GFX_SPIELER1_LEFT, 4 },
-    { GFX_SPIELER1_RIGHT, 4 },
-    { GFX_SPIELER1_PUSH_LEFT, 4 },
-    { GFX_SPIELER1_PUSH_RIGHT, 4 },
-    { GFX_SPIELER2_UP, 4 },
-    { GFX_SPIELER2_DOWN, 4 },
-    { GFX_SPIELER2_LEFT, 4 },
-    { GFX_SPIELER2_RIGHT, 4 },
-    { GFX_SPIELER2_PUSH_LEFT, 4 },
-    { GFX_SPIELER2_PUSH_RIGHT, 4 },
-    { GFX_SPIELER3_UP, 4 },
-    { GFX_SPIELER3_DOWN, 4 },
-    { GFX_SPIELER3_LEFT, 4 },
-    { GFX_SPIELER3_RIGHT, 4 },
-    { GFX_SPIELER3_PUSH_LEFT, 4 },
-    { GFX_SPIELER3_PUSH_RIGHT, 4 },
-    { GFX_SPIELER4_UP, 4 },
-    { GFX_SPIELER4_DOWN, 4 },
-    { GFX_SPIELER4_LEFT, 4 },
-    { GFX_SPIELER4_RIGHT, 4 },
-    { GFX_SPIELER4_PUSH_LEFT, 4 },
-    { GFX_SPIELER4_PUSH_RIGHT, 4 },
-    { GFX_SP_MURPHY, 1 },
-    { GFX_MURPHY_GO_LEFT, 3 },
-    { GFX_MURPHY_GO_RIGHT, 3 },
-    { GFX_MURPHY_SNAP_UP, 1 },
-    { GFX_MURPHY_SNAP_DOWN, 1 },
-    { GFX_MURPHY_SNAP_RIGHT, 1 },
-    { GFX_MURPHY_SNAP_LEFT, 1 },
-    { GFX_MURPHY_PUSH_RIGHT, 1 },
-    { GFX_MURPHY_PUSH_LEFT, 1 },
-    { GFX_GEBLUBBER, 4 },
-    { GFX_DYNAMIT, 7 },
-    { GFX_DYNABOMB, 4 },
-    { GFX_EXPLOSION, 8 },
-    { GFX_SOKOBAN_OBJEKT, 1 },
-    { GFX_FUNKELN_BLAU, 3 },
-    { GFX_FUNKELN_WEISS, 3 },
-    { GFX2_SHIELD_PASSIVE, 3 },
-    { GFX2_SHIELD_ACTIVE, 3 },
-    { -1, 0 }
-  };
+    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;
+  }
 
-  /* create additional image buffers for double-buffering */
+  /* 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;
+
+  if (parameter[GFX_ARG_ANIM_MODE] != ANIM_NONE)
+    graphic_info[graphic].anim_mode = parameter[GFX_ARG_ANIM_MODE];
+  else if (graphic_info[graphic].anim_frames > 1)
+    graphic_info[graphic].anim_mode = ANIM_LOOP;
+
+  /* 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];
+
+  /* this is only used for drawing font characters */
+  graphic_info[graphic].draw_x = parameter[GFX_ARG_DRAW_XOFFSET];
+  graphic_info[graphic].draw_y = parameter[GFX_ARG_DRAW_YOFFSET];
+}
 
-  pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
-  pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
+static void InitGraphicInfo()
+{
+  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;
 
-  LoadGfx(PIX_SMALLFONT, &pic[PIX_SMALLFONT]);
-  DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
-  DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
-#if defined(PLATFORM_MSDOS)
-  DrawInitText(PROGRAM_DOS_PORT_STRING, 210, FC_BLUE);
-  rest(200);
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  static boolean clipmasks_initialized = FALSE;
+  Pixmap src_pixmap;
+  XGCValues clip_gc_values;
+  unsigned long clip_gc_valuemask;
+  GC copy_clipmask_gc = None;
 #endif
-  DrawInitText("Loading graphics:",120,FC_GREEN);
-
-  for(i=0; i<NUM_PICTURES; i++)
-    if (i != PIX_SMALLFONT)
-      LoadGfx(i,&pic[i]);
 
-  /* create additional image buffers for masking of graphics */
+  if (graphic_info != NULL)
+    free(graphic_info);
 
-#if defined(TARGET_SDL)
+  graphic_info = checked_calloc(num_images * sizeof(struct GraphicInfo));
 
-  /* initialize surface array to 'NULL' */
-  for(i=0; i<NUM_TILES; i++)
-    tile_masked[i] = NULL;
-
-  /* create only those masked surfaces we really need */
-  for(i=0; tile_needs_clipping[i].start>=0; i++)
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  if (clipmasks_initialized)
   {
-    for(j=0; j<tile_needs_clipping[i].count; j++)
+    for (i=0; i<num_images; i++)
     {
-      int tile = tile_needs_clipping[i].start + j;
-      int graphic = tile;
-      int src_x, src_y;
-      int bitmap_nr;
-      Bitmap src_bitmap;
+      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
 
-      getGraphicSource(graphic, &bitmap_nr, &src_x, &src_y);
-      src_bitmap = pix_masked[bitmap_nr];
+  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;
 
-      /* create surface for masked tile graphic */
-      if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE, TILEX, TILEY,
-						WIN_SDL_DEPTH, 0, 0, 0, 0))
-	  == NULL)
-	Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError());
+    set_graphic_parameters(i, image->parameter);
 
-      /* create native transparent surface for current image */
-      SDL_SetColorKey(sdl_image_tmp, SDL_SRCCOLORKEY,
-		      SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00));
-      if ((tile_masked[tile] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
-	Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
+    /* now check if no animation frames are outside of the loaded image */
 
-      SDL_FreeSurface(sdl_image_tmp);
+    if (graphic_info[i].bitmap == NULL)
+      continue;		/* skip check for optional images that are undefined */
 
-      BlitBitmap(src_bitmap, tile_masked[tile], src_x,src_y, TILEX,TILEY, 0,0);
+    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;
     }
-  }
-
-#else /* !TARGET_SDL */
 
-  /* create graphic context structures needed for clipping */
-  clip_gc_values.graphics_exposures = False;
-  clip_gc_valuemask = GCGraphicsExposures;
-  copy_clipmask_gc =
-    XCreateGC(display, clipmask[PIX_BACK], clip_gc_valuemask, &clip_gc_values);
+    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;
+    }
 
-  clip_gc_values.graphics_exposures = False;
-  clip_gc_valuemask = GCGraphicsExposures;
-  tile_clip_gc =
-    XCreateGC(display, window, clip_gc_valuemask, &clip_gc_values);
+#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);
 
-  for(i=0; i<NUM_BITMAPS; i++)
-  {
-    if (clipmask[i])
+    if (copy_clipmask_gc == None)
     {
       clip_gc_values.graphics_exposures = False;
-      clip_gc_values.clip_mask = clipmask[i];
-      clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
-      clip_gc[i] = XCreateGC(display,window,clip_gc_valuemask,&clip_gc_values);
+      clip_gc_valuemask = GCGraphicsExposures;
+      copy_clipmask_gc = XCreateGC(display, src_bitmap->clip_mask,
+				   clip_gc_valuemask, &clip_gc_values);
     }
-  }
-
-  /* initialize pixmap array to Pixmap 'None' */
-  for(i=0; i<NUM_TILES; i++)
-    tile_clipmask[i] = None;
 
-  /* create only those clipping Pixmaps we really need */
-  for(i=0; tile_needs_clipping[i].start>=0; i++)
-  {
-    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;
-      Pixmap src_pixmap;
+    graphic_info[i].clip_mask =
+      XCreatePixmap(display, window->drawable, TILEX, TILEY, 1);
 
-      getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
-      src_pixmap = clipmask[pixmap_nr];
+    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);
 
-      tile_clipmask[tile] = XCreatePixmap(display, window, TILEX,TILEY, 1);
+    clip_gc_values.graphics_exposures = False;
+    clip_gc_values.clip_mask = graphic_info[i].clip_mask;
+    clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
 
-      XCopyArea(display,src_pixmap,tile_clipmask[tile],copy_clipmask_gc,
-		src_x,src_y, TILEX,TILEY, 0,0);
-    }
+    graphic_info[i].clip_gc =
+      XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
+#endif
   }
 
-#endif /* !TARGET_SDL */
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  if (copy_clipmask_gc)
+    XFreeGC(display, copy_clipmask_gc);
+
+  clipmasks_initialized = TRUE;
+#endif
 }
 
-void InitGfxBackground()
+static void InitElementSoundInfo()
 {
-  int x, y;
+  /* !!! soon to come !!! */
+}
 
-  drawto = backbuffer = pix[PIX_DB_BACK];
-  fieldbuffer = pix[PIX_DB_FIELD];
-  SetDrawtoField(DRAW_BACKBUFFER);
+static void set_sound_parameters(int sound, char **parameter_raw)
+{
+  int parameter[NUM_SND_ARGS];
+  int i;
 
-  BlitBitmap(pix[PIX_BACK], 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);
+  /* get integer values from string parameters */
+  for (i=0; i < NUM_SND_ARGS; i++)
+    parameter[i] =
+      get_parameter_value(sound_config_suffix[i].token, parameter_raw[i],
+			  sound_config_suffix[i].type);
 
-  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;
+  /* 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];
 }
 
-void LoadGfx(int pos, struct PictureFileInfo *pic)
+static void InitSoundInfo()
 {
-  char basefilename[256];
-  char filename[256];
+  struct PropertyMapping *property_mapping = getSoundListPropertyMapping();
+  int num_property_mappings = getSoundListPropertyMappingSize();
+  int *sound_effect_properties;
+  int num_sounds = getSoundListSize();
+  int i, j;
 
-#if defined(TARGET_SDL)
-  SDL_Surface *sdl_image_tmp;
-#else
-  int pcx_err;
-#endif
-  char *picture_ext = ".pcx";
+  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));
 
-  /* Grafik laden */
-  if (pic->picture_filename)
+  /* 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++)
   {
-    sprintf(basefilename, "%s%s", pic->picture_filename, picture_ext);
-    DrawInitText(basefilename, 150, FC_YELLOW);
-    sprintf(filename, "%s/%s/%s",
-	    options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename);
+    struct FileInfo *sound = getSoundListEntry(i);
+    int len_effect_text = strlen(sound->token);
 
-#if defined(PLATFORM_MSDOS)
-    rest(100);
-#endif
+    sound_effect_properties[i] = ACTION_OTHER;
+    sound_info[i].loop = FALSE;
 
-#if defined(TARGET_SDL)
-    /* load image to temporary surface */
-    if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
-      Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError());
+    /* determine all loop sounds and identify certain sound classes */
 
-    /* create native non-transparent surface for current image */
-    if ((pix[pos] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
-      Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
+    for (j=0; element_action_info[j].suffix; j++)
+    {
+      int len_action_text = strlen(element_action_info[j].suffix);
 
-    /* create native transparent surface for current image */
-    SDL_SetColorKey(sdl_image_tmp, SDL_SRCCOLORKEY,
-		    SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00));
-    if ((pix_masked[pos] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
-      Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
+      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;
 
-    /* free temporary surface */
-    SDL_FreeSurface(sdl_image_tmp);
+	if (element_action_info[j].is_loop_sound)
+	  sound_info[i].loop = TRUE;
+      }
+    }
 
-#else /* !TARGET_SDL */
+    /* associate elements and some selected sound actions */
 
-    pcx_err = Read_PCX_to_Pixmap(display, window, gc, filename,
-				 &pix[pos], &clipmask[pos]);
-    switch(pcx_err)
+    for (j=0; j<MAX_NUM_ELEMENTS; j++)
     {
-      case PCX_Success:
-        break;
-      case PCX_OpenFailed:
-        Error(ERR_EXIT, "cannot open PCX file '%s'", filename);
-      case PCX_ReadFailed:
-        Error(ERR_EXIT, "cannot read PCX file '%s'", filename);
-      case PCX_FileInvalid:
-	Error(ERR_EXIT, "invalid PCX file '%s'", filename);
-      case PCX_NoMemory:
-	Error(ERR_EXIT, "not enough memory for PCX file '%s'", filename);
-      case PCX_ColorFailed:
-	Error(ERR_EXIT, "cannot get colors for PCX file '%s'", filename);
-      default:
-	break;
+      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;
+	}
+      }
     }
 
-    if (!pix[pos])
-      Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename);
+    set_sound_parameters(i, sound->parameter);
+  }
+
+  free(sound_effect_properties);
+
+  /* initialize element/sound mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
+  {
+    int element   = property_mapping[i].base_index;
+    int action    = property_mapping[i].ext1_index;
+    int sound     = property_mapping[i].artwork_index;
+
+    if (action < 0)
+      action = ACTION_DEFAULT;
+
+    element_info[element].sound[action] = sound;
+  }
 
-    /* setting pix_masked[] to pix[] allows BlitBitmapMasked() to always
-       use pix_masked[], although they are the same when not using SDL */
-    pix_masked[pos] = pix[pos];
+#if 0
+  /* TEST ONLY */
+  {
+    int element = EL_CUSTOM_11;
+    int j = 0;
 
-#endif /* !TARGET_SDL */
+    while (element_action_info[j].suffix)
+    {
+      printf("element %d, sound action '%s'  == %d\n",
+	     element, element_action_info[j].suffix,
+	     element_info[element].sound[j]);
+      j++;
+    }
   }
 
-#if defined(TARGET_X11)
-  /* check if clip mask was correctly created */
-  if (pic->picture_with_mask && !clipmask[pos])
-    Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
+  PlaySoundLevelElementAction(0,0, EL_CUSTOM_11, ACTION_PUSHING);
 #endif
-}
 
-void InitGadgets()
-{
-  CreateLevelEditorGadgets();
-  CreateGameButtons();
-  CreateTapeButtons();
-  CreateToolButtons();
-  CreateScreenGadgets();
+#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()
 {
-  int i,j;
+  int i, j;
 
   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(ep_amoebalive)/sizeof(int);
+  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(ep_amoeboid)/sizeof(int);
+  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(ep_schluessel)/sizeof(int);
+  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,
+    EL_SWITCHGATE_CLOSING,
     EL_TIMEGATE_OPEN,
+    EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
-    EL_TUBE_CROSS,
+    EL_TIMEGATE_CLOSING,
+    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,
     EL_TUBE_RIGHT_DOWN
   };
-  static int ep_pforte_num = sizeof(ep_pforte)/sizeof(int);
+  static int ep_pforte_num = SIZEOF_ARRAY_INT(ep_pforte);
 
   static int ep_solid[] =
   {
-    EL_BETON,
-    EL_MAUERWERK,
-    EL_MAUER_LEBT,
-    EL_MAUER_X,
-    EL_MAUER_Y,
-    EL_MAUER_XY,
+    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_MAGIC_WALL_OFF,
-    EL_MAGIC_WALL_EMPTY,
+    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,
+    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_FULL,
-    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_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
+    EL_SP_TERMINAL,
+    EL_SP_TERMINAL_ACTIVE,
+    EL_SP_EXIT_CLOSED,
+    EL_SP_EXIT_OPEN,
+    EL_INVISIBLE_WALL,
+    EL_INVISIBLE_WALL_ACTIVE,
+    EL_SWITCHGATE_SWITCH_UP,
+    EL_SWITCHGATE_SWITCH_DOWN,
+    EL_TIMEGATE_SWITCH,
+    EL_TIMEGATE_SWITCH_ACTIVE,
+    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_WALL_PEARL,
+    EL_WALL_CRYSTAL,
+
+    /* the following elements are a direct copy of "indestructible" elements,
+       except "EL_ACID", which is "indestructible", but not "solid"! */
+#if 0
+    EL_ACID,
+#endif
+    EL_STEELWALL,
+    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,
@@ -745,27 +1577,22 @@ void InitElementProperties()
     EL_SP_HARD_BASE4,
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
-    EL_SP_TERMINAL,
-    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_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,
@@ -778,65 +1605,59 @@ 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_CRYSTAL,
-    EL_WALL_PEARL,
-    EL_WALL_CRYSTAL,
-    EL_TUBE_CROSS,
+    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,
+    EL_SWITCHGATE_CLOSING,
+    EL_TIMEGATE_OPEN,
+    EL_TIMEGATE_OPENING,
+    EL_TIMEGATE_CLOSED,
+    EL_TIMEGATE_CLOSING,
+    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,
     EL_TUBE_RIGHT_DOWN
   };
-  static int ep_solid_num = sizeof(ep_solid)/sizeof(int);
-
-  static int ep_massive[] =
-  {
-    EL_BETON,
-    EL_SALZSAEURE,
-    EL_BADEWANNE1,
-    EL_BADEWANNE2,
-    EL_BADEWANNE3,
-    EL_BADEWANNE4,
-    EL_BADEWANNE5,
-    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_SWITCHGATE_OPEN,
-    EL_SWITCHGATE_CLOSED,
-    EL_TIMEGATE_OPEN,
-    EL_TIMEGATE_CLOSED,
+  static int ep_solid_num = SIZEOF_ARRAY_INT(ep_solid);
+
+  static int ep_indestructible[] =
+  {
+    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,
@@ -848,21 +1669,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,
@@ -875,49 +1697,73 @@ 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_TUBE_CROSS,
+    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,
+    EL_SWITCHGATE_CLOSING,
+    EL_TIMEGATE_OPEN,
+    EL_TIMEGATE_OPENING,
+    EL_TIMEGATE_CLOSED,
+    EL_TIMEGATE_CLOSING,
+    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,
     EL_TUBE_RIGHT_DOWN
   };
-  static int ep_massive_num = sizeof(ep_massive)/sizeof(int);
+  static int ep_indestructible_num = SIZEOF_ARRAY_INT(ep_indestructible);
 
   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,
@@ -926,56 +1772,56 @@ void InitElementProperties()
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
     EL_SPEED_PILL,
-    EL_STEEL_SLANTED,
+    EL_STEELWALL_SLANTED,
     EL_PEARL,
     EL_CRYSTAL
   };
-  static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
+  static int ep_slippery_num = SIZEOF_ARRAY_INT(ep_slippery);
 
   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,
     EL_SP_ELECTRON
   };
-  static int ep_enemy_num = sizeof(ep_enemy)/sizeof(int);
+  static int ep_enemy_num = SIZEOF_ARRAY_INT(ep_enemy);
 
   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,
@@ -994,42 +1840,47 @@ void InitElementProperties()
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
     EL_SP_TERMINAL,
-    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_TERMINAL_ACTIVE,
+    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(ep_mauer)/sizeof(int);
+  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,
@@ -1038,31 +1889,23 @@ void InitElementProperties()
     EL_SPRING,
     EL_DX_SUPABOMB
   };
-  static int ep_can_fall_num = sizeof(ep_can_fall)/sizeof(int);
+  static int ep_can_fall_num = SIZEOF_ARRAY_INT(ep_can_fall);
 
   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_BOMB,
+    EL_NUT,
+    EL_AMOEBA_DROP,
+    EL_TIME_ORB_FULL,
+    EL_TIME_ORB_EMPTY,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
     EL_SP_DISK_ORANGE,
@@ -1071,240 +1914,240 @@ void InitElementProperties()
     EL_SPRING,
     EL_DX_SUPABOMB
   };
-  static int ep_can_smash_num = sizeof(ep_can_smash)/sizeof(int);
+  static int ep_can_smash_num = SIZEOF_ARRAY_INT(ep_can_smash);
 
   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(ep_can_change)/sizeof(int);
+  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(ep_can_move)/sizeof(int);
+  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,
     EL_PACMAN_DOWN
   };
-  static int ep_could_move_num = sizeof(ep_could_move)/sizeof(int);
+  static int ep_could_move_num = SIZEOF_ARRAY_INT(ep_could_move);
 
   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(ep_dont_touch)/sizeof(int);
+  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
   };
-  static int ep_dont_go_to_num = sizeof(ep_dont_go_to)/sizeof(int);
+  static int ep_dont_go_to_num = SIZEOF_ARRAY_INT(ep_dont_go_to);
 
   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
   };
-  static int ep_mampf2_num = sizeof(ep_mampf2)/sizeof(int);
+  static int ep_mampf2_num = SIZEOF_ARRAY_INT(ep_mampf2);
 
   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(ep_bd_element)/sizeof(int);
+  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(ep_sb_element)/sizeof(int);
+  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_SP_INFOTRON
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND
   };
-  static int ep_gem_num = sizeof(ep_gem)/sizeof(int);
+  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,
@@ -1337,20 +2180,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,
@@ -1363,40 +2204,41 @@ 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(ep_inactive)/sizeof(int);
+  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_SP_DISK_RED_ACTIVE,
+    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,
@@ -1404,31 +2246,31 @@ void InitElementProperties()
     EL_SP_ELECTRON,
     EL_DX_SUPABOMB
   };
-  static int ep_explosive_num = sizeof(ep_explosive)/sizeof(int);
+  static int ep_explosive_num = SIZEOF_ARRAY_INT(ep_explosive);
 
   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
   };
-  static int ep_mampf3_num = sizeof(ep_mampf3)/sizeof(int);
+  static int ep_mampf3_num = SIZEOF_ARRAY_INT(ep_mampf3);
 
   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,
@@ -1436,37 +2278,38 @@ void InitElementProperties()
     EL_SPRING,
     EL_DX_SUPABOMB
   };
-  static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int);
+  static int ep_pushable_num = SIZEOF_ARRAY_INT(ep_pushable);
 
   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(ep_player)/sizeof(int);
+  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(ep_has_content)/sizeof(int);
+  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(ep_eatable)/sizeof(int);
+  static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable);
 
   static int ep_sp_element[] =
   {
@@ -1477,7 +2320,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,
@@ -1495,7 +2339,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,
@@ -1511,22 +2355,22 @@ 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
   };
-  static int ep_sp_element_num = sizeof(ep_sp_element)/sizeof(int);
+  static int ep_sp_element_num = SIZEOF_ARRAY_INT(ep_sp_element);
 
   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,
@@ -1541,7 +2385,7 @@ void InitElementProperties()
     EL_SWITCHGATE_OPEN,
     EL_TIMEGATE_OPEN
   };
-  static int ep_quick_gate_num = sizeof(ep_quick_gate)/sizeof(int);
+  static int ep_quick_gate_num = SIZEOF_ARRAY_INT(ep_quick_gate);
 
   static int ep_over_player[] =
   {
@@ -1556,79 +2400,97 @@ 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,
     EL_TUBE_RIGHT_DOWN
   };
-  static int ep_over_player_num = sizeof(ep_over_player)/sizeof(int);
+  static int ep_over_player_num = SIZEOF_ARRAY_INT(ep_over_player);
 
   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,
+    EL_SP_DISK_RED_ACTIVE
   };
-  static int ep_active_bomb_num = sizeof(ep_active_bomb)/sizeof(int);
+  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(ep_belt)/sizeof(int);
+  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(ep_belt_switch)/sizeof(int);
+  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,
     EL_TUBE_RIGHT_DOWN
   };
-  static int ep_tube_num = sizeof(ep_tube)/sizeof(int);
+  static int ep_tube_num = SIZEOF_ARRAY_INT(ep_tube);
 
   static long ep1_bit[] =
   {
@@ -1637,7 +2499,7 @@ void InitElementProperties()
     EP_BIT_SCHLUESSEL,
     EP_BIT_PFORTE,
     EP_BIT_SOLID,
-    EP_BIT_MASSIVE,
+    EP_BIT_INDESTRUCTIBLE,
     EP_BIT_SLIPPERY,
     EP_BIT_ENEMY,
     EP_BIT_MAUER,
@@ -1667,6 +2529,7 @@ void InitElementProperties()
   static long ep2_bit[] =
   {
     EP_BIT_BELT,
+    EP_BIT_BELT_ACTIVE,
     EP_BIT_BELT_SWITCH,
     EP_BIT_TUBE
   };
@@ -1677,7 +2540,7 @@ void InitElementProperties()
     ep_schluessel,
     ep_pforte,
     ep_solid,
-    ep_massive,
+    ep_indestructible,
     ep_slippery,
     ep_enemy,
     ep_mauer,
@@ -1707,6 +2570,7 @@ void InitElementProperties()
   static int *ep2_array[] =
   {
     ep_belt,
+    ep_belt_active,
     ep_belt_switch,
     ep_tube
   };
@@ -1717,7 +2581,7 @@ void InitElementProperties()
     &ep_schluessel_num,
     &ep_pforte_num,
     &ep_solid_num,
-    &ep_massive_num,
+    &ep_indestructible_num,
     &ep_slippery_num,
     &ep_enemy_num,
     &ep_mauer_num,
@@ -1747,76 +2611,136 @@ 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(ep1_num)/sizeof(int *);
-  static int num_properties2 = sizeof(ep2_num)/sizeof(int *);
+  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 CloseAllAndExit(int exit_value)
+void Execute_Command(char *command)
 {
-  int i;
+  if (strcmp(command, "print graphicsinfo.conf") == 0)
+  {
+    int i;
 
-#if defined(TARGET_SDL)
-  StopSounds();
-  FreeSounds(NUM_SOUNDS);
-#else
-  if (audio.soundserver_pid)
+    printf("# You can configure additional/alternative image files here.\n");
+    printf("# (The images below are default and therefore commented out.)\n");
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("name", "Classic Graphics"));
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+    printf("\n");
+
+    for (i=0; image_config[i].token != NULL; i++)
+      printf("# %s\n",
+	     getFormattedSetupEntry(image_config[i].token,
+				    image_config[i].value));
+
+    exit(0);
+  }
+  else if (strcmp(command, "print soundsinfo.conf") == 0)
   {
-    StopSounds();
-    kill(audio.soundserver_pid, SIGTERM);
-    FreeSounds(NUM_SOUNDS);
+    int i;
+
+    printf("# You can configure additional/alternative sound files here.\n");
+    printf("# (The sounds below are default and therefore commented out.)\n");
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("name", "Classic Sounds"));
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+    printf("\n");
+
+    for (i=0; sound_config[i].token != NULL; i++)
+      printf("# %s\n",
+	     getFormattedSetupEntry(sound_config[i].token,
+				    sound_config[i].value));
+
+    exit(0);
   }
-#endif
+  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"));
 
-  for(i=0; i<NUM_BITMAPS; i++)
+    exit(0);
+  }
+  else if (strncmp(command, "dump level ", 11) == 0)
   {
-    if (pix[i])
-      FreeBitmap(pix[i]);
+    char *filename = &command[11];
 
-#if defined(TARGET_SDL)
-    FreeBitmap(pix_masked[i]);
-#else
-    if (clipmask[i])
-      FreeBitmap(clipmask[i]);
-    if (clip_gc[i])
-      XFreeGC(display, clip_gc[i]);
-#endif
+    if (access(filename, F_OK) != 0)
+      Error(ERR_EXIT, "cannot open file '%s'", filename);
+
+    LoadLevelFromFilename(filename);
+    DumpLevel(&level);
+
+    exit(0);
   }
+  else if (strncmp(command, "dump tape ", 10) == 0)
+  {
+    char *filename = &command[10];
 
-#if defined(TARGET_SDL)
-  KeyboardAutoRepeatOn();
-#else
-  if (gc)
-    XFreeGC(display, gc);
+    if (access(filename, F_OK) != 0)
+      Error(ERR_EXIT, "cannot open file '%s'", filename);
+
+    LoadTapeFromFilename(filename);
+    DumpTape(&tape);
 
-  if (display)
+    exit(0);
+  }
+  else if (strncmp(command, "autoplay ", 9) == 0)
   {
-    KeyboardAutoRepeatOn();
-    XCloseDisplay(display);
+    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 */
+    }
   }
-#endif
+  else
+  {
+    Error(ERR_EXIT_HELP, "unrecognized command '%s'", command);
+  }
+}
 
-#if !defined(PLATFORM_UNIX)
-  dumpErrorFile();
-#endif
+void CloseAllAndExit(int exit_value)
+{
+  StopSounds();
+  FreeAllSounds();
+  FreeAllMusic();
+  CloseAudio();		/* called after freeing sounds (needed for SDL) */
+
+  FreeAllImages();
+  FreeTileClipmasks();
+
+  CloseVideoDisplay();
+  ClosePlatformDependantStuff();
 
   exit(exit_value);
 }