X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Finit.c;h=508a50af5580138576d56812052d4f5029ec8e14;hp=42e502dcd94996ea0212e08d9c2bd7d77b4d6e7f;hb=5ae04ac2ef54f6f164a797c16c9782042cc2ce67;hpb=c38b8938950533926b72af227c38513fe665a8f6

diff --git a/src/init.c b/src/init.c
index 42e502dc..508a50af 100644
--- a/src/init.c
+++ b/src/init.c
@@ -24,215 +24,22 @@
 #include "network.h"
 #include "netserv.h"
 #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_e2s.c"	/* include auto-generated data structure definitions */
+#include "conf_fnt.c"	/* include auto-generated data structure definitions */
 
 
-static char *image_filename[NUM_PICTURES] =
-{
-#if 0
-  "RocksScreen.pcx",
-  "RocksDoor.pcx",
-  "RocksToons.pcx",
-  "RocksFontBig.pcx",
-  "RocksFontSmall.pcx",
-  "RocksFontMedium.pcx",
-  "RocksFontEM.pcx"
-#else
-  "RocksScreen.pcx",
-  "RocksElements.pcx",
-  "RocksDoor.pcx",
-  "RocksHeroes.pcx",
-  "RocksToons.pcx",
-  "RocksSP.pcx",
-  "RocksDC.pcx",
-  "RocksMore.pcx",
-  "RocksFontBig.pcx",
-  "RocksFontSmall.pcx",
-  "RocksFontMedium.pcx",
-  "RocksFontEM.pcx"
-#endif
-}; 
-
-static Bitmap *bitmap_font_initial = NULL;
-
-static void InitSetup(void);
-static void InitPlayerInfo(void);
-static void InitLevelInfo(void);
-static void InitArtworkInfo(void);
-static void InitLevelArtworkInfo(void);
-static void InitNetworkServer(void);
-static void InitImages(void);
-static void InitMixer(void);
-static void InitSound(void);
-static void InitGfx(void);
-static void InitGfxBackground(void);
-static void InitGadgets(void);
-static void InitElementProperties(void);
-static void InitElementInfo(void);
-static void InitGraphicInfo(void);
-static void InitSoundInfo();
-static void Execute_Debug_Command(char *);
-
-void OpenAll(void)
-{
-  if (options.debug_command)
-  {
-    Execute_Debug_Command(options.debug_command);
-
-    exit(0);
-  }
-
-  if (options.serveronly)
-  {
-#if defined(PLATFORM_UNIX)
-    NetworkServer(options.server_port, options.serveronly);
-#else
-    Error(ERR_WARN, "networking only supported in Unix version");
-#endif
-    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 */
-
-  InitCounter();
-  InitMixer();
-  InitJoysticks();
-  InitRND(NEW_RANDOMIZE);
-
-  InitVideoDisplay();
-  InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH,
-		  setup.fullscreen);
-
-  InitEventFilter(FilterMouseMotionEvents);
-
-  InitElementProperties();	/* initializes IS_CHAR() for el2gfx() */
-  InitElementInfo();
-
-  InitGfx();
-
-  InitLevelInfo();
-  InitLevelArtworkInfo();
-
-  InitImages();			/* needs to know current level directory */
-  InitSound();			/* needs to know current level directory */
-  InitGadgets();		/* needs images + number of level series */
-
-  InitGfxBackground();
-  InitToons();
-
-  DrawMainMenu();
-
-  InitNetworkServer();
-}
-
-void InitSetup()
-{
-  LoadSetup();					/* global setup info */
-}
-
-void InitPlayerInfo()
-{
-  int i;
-
-  /* choose default local player */
-  local_player = &stored_player[0];
-
-  for (i=0; i<MAX_PLAYERS; i++)
-    stored_player[i].connected = FALSE;
-
-  local_player->connected = TRUE;
-}
-
-void InitLevelInfo()
-{
-  LoadLevelInfo();				/* global level info */
-  LoadLevelSetup_LastSeries();			/* last played series info */
-  LoadLevelSetup_SeriesInfo();			/* last played level info */
-}
-
-void InitArtworkInfo()
-{
-  LoadArtworkInfo();
-}
-
-void InitLevelArtworkInfo()
-{
-  LoadLevelArtworkInfo();
-}
-
-void InitNetworkServer()
-{
-#if defined(PLATFORM_UNIX)
-  int nr_wanted;
-#endif
-
-  if (!options.network)
-    return;
-
-#if defined(PLATFORM_UNIX)
-  nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
-
-  if (!ConnectToServer(options.server_host, options.server_port))
-    Error(ERR_EXIT, "cannot connect to network game server");
-
-  SendToServer_PlayerName(setup.player_name);
-  SendToServer_ProtocolVersion();
-
-  if (nr_wanted)
-    SendToServer_NrWanted(nr_wanted);
-#endif
-}
-
-static void ReinitializeGraphics()
-{
-  ReloadCustomImages();		/* load custom image files */
-
-  InitGraphicInfo();		/* initialize graphic info from config file */
-
-  InitFontInfo(bitmap_font_initial,
-	       new_graphic_info[IMG_MENU_FONT_BIG].bitmap,
-	       new_graphic_info[IMG_MENU_FONT_MEDIUM].bitmap,
-	       new_graphic_info[IMG_MENU_FONT_SMALL].bitmap,
-	       new_graphic_info[IMG_MENU_FONT_EM].bitmap);
-}
+#define CONFIG_TOKEN_FONT_INITIAL		"font.initial"
 
-static void InitImages()
-{
-  InitImageList(image_config, image_config_suffix, NUM_IMAGE_FILES);
-
-  ReinitializeGraphics();
-}
-
-static void InitMixer()
-{
-  OpenAudio();
-
-  InitSoundList(sound_config, sound_config_suffix, NUM_SOUND_FILES);
-
-  StartMixer();
-}
 
-static void InitSound()
-{
-  /* load custom sounds and music */
-  InitReloadSounds(artwork.snd_current->identifier);
-  InitReloadMusic(artwork.mus_current->identifier);
+struct FontBitmapInfo font_initial[NUM_INITIAL_FONTS];
 
-  InitSoundInfo();
-}
 
 static void InitTileClipmasks()
 {
+#if 0
 #if defined(TARGET_X11)
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
@@ -367,10 +174,12 @@ static void InitTileClipmasks()
 
 #endif /* TARGET_X11_NATIVE */
 #endif /* TARGET_X11 */
+#endif
 }
 
 void FreeTileClipmasks()
 {
+#if 0
 #if defined(TARGET_X11)
   int i;
 
@@ -399,742 +208,301 @@ void FreeTileClipmasks()
 #endif
 
 #endif /* TARGET_X11 */
+#endif
 }
 
-void InitGfx()
+void FreeGadgets()
 {
-#if 0
+  FreeLevelEditorGadgets();
+  FreeGameButtons();
+  FreeTapeButtons();
+  FreeToolButtons();
+  FreeScreenGadgets();
+}
+
+void InitGadgets()
+{
+  static boolean gadgets_initialized = FALSE;
+
+  if (gadgets_initialized)
+    FreeGadgets();
+
+  CreateLevelEditorGadgets();
+  CreateGameButtons();
+  CreateTapeButtons();
+  CreateToolButtons();
+  CreateScreenGadgets();
+
+  gadgets_initialized = TRUE;
+}
+
+void InitElementSmallImages()
+{
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
   int i;
-#endif
 
-  /* initialize some global variables */
-  global.frames_per_second = 0;
-  global.fps_slowdown = FALSE;
-  global.fps_slowdown_factor = 1;
+  /* initialize normal images from static configuration */
+  for (i=0; element_to_graphic[i].element > -1; i++)
+    CreateImageWithSmallImages(element_to_graphic[i].graphic);
 
-  /* 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);
+  /* initialize special images from static configuration */
+  for (i=0; element_to_special_graphic[i].element > -1; i++)
+    CreateImageWithSmallImages(element_to_special_graphic[i].graphic);
 
-  /* 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);
+  /* 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);
+}
 
-#if 0
-  pix[PIX_FONT_SMALL] = LoadCustomImage(image_filename[PIX_FONT_SMALL]);
+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;
+}
 
-  InitFontInfo(NULL, NULL, pix[PIX_FONT_SMALL], NULL);
-#else
-  bitmap_font_initial = LoadCustomImage(image_filename[PIX_FONT_SMALL]);
+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;
 
-  InitFontInfo(bitmap_font_initial, NULL, NULL, NULL, NULL);
-#endif
+  if (graphic_info == NULL)		/* still at startup phase */
+  {
+    InitFontInfo(font_initial, NUM_INITIAL_FONTS, getFontBitmapID);
 
-  DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
-  DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
+    return;
+  }
 
-  DrawInitText("Loading graphics:", 120, FC_GREEN);
+  /* ---------- initialize font graphic definitions ---------- */
 
-#if 0
-  for (i=0; i<NUM_PICTURES; i++)
+  /* 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++)
   {
-#if 0
-    if (i != PIX_FONT_SMALL)
-#endif
+    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++)
     {
-      DrawInitText(image_filename[i], 150, FC_YELLOW);
+      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;
 
-      pix[i] = LoadCustomImage(image_filename[i]);
+    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++;
     }
   }
-#endif
 
-#if 0
-  InitFontInfo(pix[PIX_FONT_BIG], pix[PIX_FONT_MEDIUM], pix[PIX_FONT_SMALL],
-	       pix[PIX_FONT_EM]);
-#endif
+  /* 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;
 
-  InitTileClipmasks();
-}
+    if (font_nr < 0)
+      continue;
 
-void InitGfxBackground()
-{
-  int x, y;
+    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++;
+    }
+  }
 
-  drawto = backbuffer;
-  fieldbuffer = bitmap_db_field;
-  SetDrawtoField(DRAW_BACKBUFFER);
+  /* ---------- initialize font bitmap array ---------- */
 
-  BlitBitmap(new_graphic_info[IMG_MENU_BACK].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);
+  if (font_bitmap_info != NULL)
+    free(font_bitmap_info);
 
-  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;
-}
+  font_bitmap_info =
+    checked_calloc(num_font_bitmaps * sizeof(struct FontBitmapInfo));
 
-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;
+  /* ---------- initialize font bitmap definitions ---------- */
 
-  if (leveldir_current_identifier == NULL)
-    leveldir_current_identifier = leveldir_current->identifier;
+  for (i=0; i < NUM_FONTS; i++)
+  {
+    if (i < NUM_INITIAL_FONTS)
+    {
+      font_bitmap_info[i] = font_initial[i];
+      continue;
+    }
 
-#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
+    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];
 
-#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
+      /* set 'graphic_info' for font entries, if uninitialized (guessed) */
+      if (graphic_info[graphic].anim_frames < MIN_NUM_CHARS_PER_FONT)
+      {
+	graphic_info[graphic].anim_frames = DEFAULT_NUM_CHARS_PER_FONT;
+	graphic_info[graphic].anim_frames_per_line= DEFAULT_NUM_CHARS_PER_LINE;
+      }
 
-  /* leveldir_current may be invalid (level group, parent link) */
-  if (!validLevelSeries(leveldir_current))
-    return;
+      /* 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;
+
+      font_bitmap_info[font_bitmap_id].num_chars =
+	graphic_info[graphic].anim_frames;
+      font_bitmap_info[font_bitmap_id].num_chars_per_line =
+	graphic_info[graphic].anim_frames_per_line;
+    }
+  }
 
-#if 0
-  printf("--> '%s'\n", artwork.gfx_current_identifier);
-#endif
+  InitFontInfo(font_bitmap_info, num_font_bitmaps, getFontBitmapID);
+}
 
-  /* 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;
-  }
-
-  /* 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)
-  {
-#if 0
-    printf("CHANGED GFX: '%s' -> '%s'\n",
-	   artwork.gfx_current_identifier, gfx_new_identifier);
-#endif
-
-#if 0
-    int i;
-#endif
-
-    setLevelArtworkDir(artwork.gfx_first);
-
-    ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
-
-#if 0
-    for (i=0; i<NUM_PICTURES; i++)
-    {
-      DrawInitText(image_filename[i], 150, FC_YELLOW);
-      ReloadCustomImage(pix[i], image_filename[i]);
-    }
-#endif
-
-    ReinitializeGraphics();
-
-    FreeTileClipmasks();
-    InitTileClipmasks();
-
-#if 0
-    InitGfxBackground();
-
-    /* force redraw of (open or closed) door graphics */
-    SetDoorState(DOOR_OPEN_ALL);
-    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
-#endif
-
-#if 0
-    artwork.gfx_current_identifier = gfx_new_identifier;
-#else
-    artwork.gfx_current_identifier = artwork.gfx_current->identifier;
-#endif
-    last_override_level_graphics = setup.override_level_graphics;
-
-    redraw_screen = TRUE;
-  }
-
-  if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 ||
-      last_override_level_sounds != setup.override_level_sounds)
-  {
-    /* set artwork path to send it to the sound server process */
-    setLevelArtworkDir(artwork.snd_first);
-
-    InitReloadSounds(snd_new_identifier);
-
-    artwork.snd_current_identifier = snd_new_identifier;
-    last_override_level_sounds = setup.override_level_sounds;
-
-    redraw_screen = TRUE;
-  }
-
-  if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 ||
-      last_override_level_music != setup.override_level_music)
-  {
-    /* set artwork path to send it to the sound server process */
-    setLevelArtworkDir(artwork.mus_first);
-
-    InitReloadMusic(mus_new_identifier);
-
-    artwork.mus_current_identifier = mus_new_identifier;
-    last_override_level_music = setup.override_level_music;
-
-    redraw_screen = TRUE;
-  }
-
-  if (redraw_screen)
-  {
-    InitGfxBackground();
-
-    /* force redraw of (open or closed) door graphics */
-    SetDoorState(DOOR_OPEN_ALL);
-    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
-  }
-
-#if 0
-  printf("<-- '%s'\n", artwork.gfx_current_identifier);
-#endif
-}
-
-void InitGadgets()
-{
-  CreateLevelEditorGadgets();
-  CreateGameButtons();
-  CreateTapeButtons();
-  CreateToolButtons();
-  CreateScreenGadgets();
-}
-
-void InitElementInfo()
+void InitElementGraphicInfo()
 {
-#if 0
-  static struct
-  {
-    int element;
-    int graphic;
-  }
-  element_to_graphic[] =
-  {
-    { EL_EMPTY,				GFX_LEERRAUM		},
-    { EL_SAND,				GFX_ERDREICH		},
-    { EL_WALL,				GFX_MAUERWERK		},
-    { EL_WALL_CRUMBLED,			GFX_FELSBODEN		},
-    { EL_ROCK,				GFX_FELSBROCKEN		},
-    { EL_EMERALD,			GFX_EDELSTEIN		},
-    { EL_EXIT_CLOSED,			GFX_AUSGANG_ZU		},
-    { EL_EXIT_OPENING,			GFX_AUSGANG_ACT		},
-    { EL_EXIT_OPEN,			GFX_AUSGANG_AUF		},
-    { EL_SP_EXIT_OPEN,			GFX_SP_EXIT		},
-    { EL_PLAYER1,			GFX_SPIELER1		},
-    { EL_PLAYER2,			GFX_SPIELER2		},
-    { EL_PLAYER3,			GFX_SPIELER3		},
-    { EL_PLAYER4,			GFX_SPIELER4		},
-    { EL_BUG,				GFX_KAEFER		},
-    { EL_BUG_RIGHT,			GFX_KAEFER_RIGHT	},
-    { EL_BUG_UP,			GFX_KAEFER_UP		},
-    { EL_BUG_LEFT,			GFX_KAEFER_LEFT		},
-    { EL_BUG_DOWN,			GFX_KAEFER_DOWN		},
-    { EL_SPACESHIP,			GFX_FLIEGER		},
-    { EL_SPACESHIP_RIGHT,		GFX_FLIEGER_RIGHT	},
-    { EL_SPACESHIP_UP,			GFX_FLIEGER_UP		},
-    { EL_SPACESHIP_LEFT,		GFX_FLIEGER_LEFT	},
-    { EL_SPACESHIP_DOWN,		GFX_FLIEGER_DOWN	},
-    { EL_BD_BUTTERFLY,			GFX_BUTTERFLY		},
-    { EL_BD_BUTTERFLY_RIGHT,		GFX_BUTTERFLY_RIGHT	},
-    { EL_BD_BUTTERFLY_UP,		GFX_BUTTERFLY_UP	},
-    { EL_BD_BUTTERFLY_LEFT,		GFX_BUTTERFLY_LEFT	},
-    { EL_BD_BUTTERFLY_DOWN,		GFX_BUTTERFLY_DOWN	},
-    { EL_BD_FIREFLY,			GFX_FIREFLY		},
-    { EL_BD_FIREFLY_RIGHT,		GFX_FIREFLY_RIGHT	},
-    { EL_BD_FIREFLY_UP,			GFX_FIREFLY_UP		},
-    { EL_BD_FIREFLY_LEFT,		GFX_FIREFLY_LEFT	},
-    { EL_BD_FIREFLY_DOWN,		GFX_FIREFLY_DOWN	},
-    { EL_YAMYAM,			GFX_MAMPFER		},
-    { EL_ROBOT,				GFX_ROBOT		},
-    { EL_STEELWALL,			GFX_BETON		},
-    { EL_DIAMOND,			GFX_DIAMANT		},
-    { EL_QUICKSAND_EMPTY,		GFX_MORAST_LEER		},
-    { EL_QUICKSAND_FULL,		GFX_MORAST_VOLL		},
-    { EL_QUICKSAND_EMPTYING,		GFX_MORAST_LEER		},
-    { EL_AMOEBA_DROP,			GFX_TROPFEN		},
-    { EL_BOMB,				GFX_BOMBE		},
-    { EL_MAGIC_WALL,			GFX_MAGIC_WALL_OFF	},
-    { EL_MAGIC_WALL_ACTIVE,		GFX_MAGIC_WALL_EMPTY	},
-    { EL_MAGIC_WALL_EMPTYING,		GFX_MAGIC_WALL_EMPTY	},
-    { EL_MAGIC_WALL_FULL,		GFX_MAGIC_WALL_FULL	},
-    { EL_MAGIC_WALL_DEAD,		GFX_MAGIC_WALL_DEAD	},
-    { EL_ACID,				GFX_SALZSAEURE		},
-    { EL_AMOEBA_DEAD,			GFX_AMOEBE_TOT		},
-    { EL_AMOEBA_WET,			GFX_AMOEBE_NASS		},
-    { EL_AMOEBA_DRY,			GFX_AMOEBE_NORM		},
-    { EL_AMOEBA_FULL,			GFX_AMOEBE_VOLL		},
-    { EL_BD_AMOEBA,			GFX_AMOEBE_BD		},
-    { EL_AMOEBA_TO_DIAMOND,		GFX_AMOEBA2DIAM		},
-    { EL_AMOEBA_DRIPPING,		GFX_AMOEBE_NASS		},
-    { EL_NUT,				GFX_KOKOSNUSS		},
-    { EL_GAMEOFLIFE,			GFX_LIFE		},
-    { EL_BIOMAZE,			GFX_LIFE_ASYNC		},
-    { EL_DYNAMITE_ACTIVE,		GFX_DYNAMIT		},
-    { EL_STONEBLOCK,			GFX_BADEWANNE		},
-    { EL_ACIDPOOL_TOPLEFT,		GFX_BADEWANNE1		},
-    { EL_ACIDPOOL_TOPRIGHT,		GFX_BADEWANNE2		},
-    { EL_ACIDPOOL_BOTTOMLEFT,		GFX_BADEWANNE3		},
-    { EL_ACIDPOOL_BOTTOM,		GFX_BADEWANNE4		},
-    { EL_ACIDPOOL_BOTTOMRIGHT,		GFX_BADEWANNE5		},
-    { EL_ROBOT_WHEEL,			GFX_ABLENK_AUS		},
-    { EL_ROBOT_WHEEL_ACTIVE,		GFX_ABLENK_EIN		},
-    { EL_KEY1,				GFX_SCHLUESSEL1		},
-    { EL_KEY2,				GFX_SCHLUESSEL2		},
-    { EL_KEY3,				GFX_SCHLUESSEL3		},
-    { EL_KEY4,				GFX_SCHLUESSEL4		},
-    { EL_GATE1,				GFX_PFORTE1		},
-    { EL_GATE2,				GFX_PFORTE2		},
-    { EL_GATE3,				GFX_PFORTE3		},
-    { EL_GATE4,				GFX_PFORTE4		},
-    { EL_GATE1_GRAY,			GFX_PFORTE1X		},
-    { EL_GATE2_GRAY,			GFX_PFORTE2X		},
-    { EL_GATE3_GRAY,			GFX_PFORTE3X		},
-    { EL_GATE4_GRAY,			GFX_PFORTE4X		},
-    { EL_DYNAMITE,			GFX_DYNAMIT_AUS		},
-    { EL_PACMAN,			GFX_PACMAN		},
-    { EL_PACMAN_RIGHT,			GFX_PACMAN_RIGHT	},
-    { EL_PACMAN_UP,			GFX_PACMAN_UP		},
-    { EL_PACMAN_LEFT,			GFX_PACMAN_LEFT		},
-    { EL_PACMAN_DOWN,			GFX_PACMAN_DOWN		},
-    { EL_INVISIBLE_WALL,		GFX_UNSICHTBAR		},
-    { EL_INVISIBLE_WALL_ACTIVE,		GFX_UNSICHTBAR_ON	},
-    { EL_WALL_EMERALD,			GFX_ERZ_EDEL		},
-    { EL_WALL_DIAMOND,			GFX_ERZ_DIAM		},
-    { EL_LAMP,				GFX_BIRNE_AUS		},
-    { EL_LAMP_ACTIVE,			GFX_BIRNE_EIN		},
-    { EL_TIME_ORB_FULL,			GFX_ZEIT_VOLL		},
-    { EL_TIME_ORB_EMPTY,		GFX_ZEIT_LEER		},
-    { EL_WALL_GROWING,			GFX_MAUER_LEBT		},
-    { EL_WALL_GROWING_X,		GFX_MAUER_X		},
-    { EL_WALL_GROWING_Y,		GFX_MAUER_Y		},
-    { EL_WALL_GROWING_XY,		GFX_MAUER_XY		},
-    { EL_BD_DIAMOND,			GFX_EDELSTEIN_BD	},
-    { EL_EMERALD_YELLOW,		GFX_EDELSTEIN_GELB	},
-    { EL_EMERALD_RED,			GFX_EDELSTEIN_ROT	},
-    { EL_EMERALD_PURPLE,		GFX_EDELSTEIN_LILA	},
-    { EL_WALL_BD_DIAMOND,		GFX_ERZ_EDEL_BD		},
-    { EL_WALL_EMERALD_YELLOW,		GFX_ERZ_EDEL_GELB	},
-    { EL_WALL_EMERALD_RED,		GFX_ERZ_EDEL_ROT	},
-    { EL_WALL_EMERALD_PURPLE,		GFX_ERZ_EDEL_LILA	},
-    { EL_DARK_YAMYAM,			GFX_MAMPFER2		},
-    { EL_BD_MAGIC_WALL,			GFX_MAGIC_WALL_BD_OFF	},
-    { EL_BD_MAGIC_WALL_ACTIVE,		GFX_MAGIC_WALL_BD_EMPTY	},
-    { EL_BD_MAGIC_WALL_EMPTYING,	GFX_MAGIC_WALL_BD_EMPTY	},
-    { EL_BD_MAGIC_WALL_FULL,		GFX_MAGIC_WALL_BD_FULL	},
-    { EL_BD_MAGIC_WALL_DEAD,		GFX_MAGIC_WALL_BD_DEAD	},
-    { EL_DYNABOMB_PLAYER1_ACTIVE,	GFX_DYNABOMB		},
-    { EL_DYNABOMB_PLAYER2_ACTIVE,	GFX_DYNABOMB		},
-    { EL_DYNABOMB_PLAYER3_ACTIVE,	GFX_DYNABOMB		},
-    { EL_DYNABOMB_PLAYER4_ACTIVE,	GFX_DYNABOMB		},
-    { EL_DYNABOMB_NR,			GFX_DYNABOMB_NR		},
-    { EL_DYNABOMB_SZ,			GFX_DYNABOMB_SZ		},
-    { EL_DYNABOMB_XL,			GFX_DYNABOMB_XL		},
-    { EL_SOKOBAN_OBJECT,		GFX_SOKOBAN_OBJEKT	},
-    { EL_SOKOBAN_FIELD_EMPTY,		GFX_SOKOBAN_FELD_LEER	},
-    { EL_SOKOBAN_FIELD_FULL,		GFX_SOKOBAN_FELD_VOLL	},
-    { EL_MOLE,				GFX_MOLE		},
-    { EL_PENGUIN,			GFX_PINGUIN		},
-    { EL_PIG,				GFX_SCHWEIN		},
-    { EL_DRAGON,			GFX_DRACHE		},
-    { EL_SATELLITE,			GFX_SONDE		},
-    { EL_ARROW_BLUE_LEFT,		GFX_PFEIL_LEFT		},
-    { EL_ARROW_BLUE_RIGHT,		GFX_PFEIL_RIGHT		},
-    { EL_ARROW_BLUE_UP,			GFX_PFEIL_UP		},
-    { EL_ARROW_BLUE_DOWN,		GFX_PFEIL_DOWN		},
-    { EL_SPEED_PILL,			GFX_SPEED_PILL		},
-    { EL_SP_TERMINAL_ACTIVE,		GFX_SP_TERMINAL		},
-    { EL_SP_BUGGY_BASE_ACTIVE,		GFX_SP_BUG_ACTIVE	},
-    { EL_SP_ZONK,			GFX_SP_ZONK		},
-    { EL_INVISIBLE_STEELWALL,		GFX_INVISIBLE_STEEL	},
-    { EL_INVISIBLE_STEELWALL_ACTIVE,	GFX_INVISIBLE_STEEL_ON	},
-    { EL_BLACK_ORB,			GFX_BLACK_ORB		},
-    { EL_EM_GATE1,			GFX_EM_GATE_1		},
-    { EL_EM_GATE2,			GFX_EM_GATE_2		},
-    { EL_EM_GATE3,			GFX_EM_GATE_3		},
-    { EL_EM_GATE4,			GFX_EM_GATE_4		},
-    { EL_EM_GATE1_GRAY,			GFX_EM_GATE_1X		},
-    { EL_EM_GATE2_GRAY,			GFX_EM_GATE_2X		},
-    { EL_EM_GATE3_GRAY,			GFX_EM_GATE_3X		},
-    { EL_EM_GATE4_GRAY,			GFX_EM_GATE_4X		},
-    { EL_EM_KEY1_FILE,			GFX_EM_KEY_1		},
-    { EL_EM_KEY2_FILE,			GFX_EM_KEY_2		},
-    { EL_EM_KEY3_FILE,			GFX_EM_KEY_3		},
-    { EL_EM_KEY4_FILE,			GFX_EM_KEY_4		},
-    { EL_EM_KEY1,			GFX_EM_KEY_1		},
-    { EL_EM_KEY2,			GFX_EM_KEY_2		},
-    { EL_EM_KEY3,			GFX_EM_KEY_3		},
-    { EL_EM_KEY4,			GFX_EM_KEY_4		},
-    { EL_PEARL,				GFX_PEARL		},
-    { EL_CRYSTAL,			GFX_CRYSTAL		},
-    { EL_WALL_PEARL,			GFX_WALL_PEARL		},
-    { EL_WALL_CRYSTAL,			GFX_WALL_CRYSTAL	},
-    { EL_DOOR_WHITE,			GFX_DOOR_WHITE		},
-    { EL_DOOR_WHITE_GRAY,		GFX_DOOR_WHITE_GRAY	},
-    { EL_KEY_WHITE,			GFX_KEY_WHITE		},
-    { EL_SHIELD_NORMAL,			GFX_SHIELD_PASSIVE	},
-    { EL_SHIELD_DEADLY,			GFX_SHIELD_ACTIVE	},
-    { EL_EXTRA_TIME,			GFX_EXTRA_TIME		},
-    { EL_SWITCHGATE_OPEN,		GFX_SWITCHGATE_OPEN	},
-    { EL_SWITCHGATE_CLOSED,		GFX_SWITCHGATE_CLOSED	},
-    { EL_SWITCHGATE_SWITCH_UP,		GFX_SWITCHGATE_SWITCH_1	},
-    { EL_SWITCHGATE_SWITCH_DOWN,	GFX_SWITCHGATE_SWITCH_2	},
-    { EL_CONVEYOR_BELT1_LEFT,		GFX_BELT1_LEFT		},
-    { EL_CONVEYOR_BELT1_MIDDLE,		GFX_BELT1_MIDDLE	},
-    { EL_CONVEYOR_BELT1_RIGHT,		GFX_BELT1_RIGHT		},
-    { EL_CONVEYOR_BELT1_LEFT_ACTIVE,	GFX_BELT1_LEFT		},
-    { EL_CONVEYOR_BELT1_MIDDLE_ACTIVE,	GFX_BELT1_MIDDLE	},
-    { EL_CONVEYOR_BELT1_RIGHT_ACTIVE,	GFX_BELT1_RIGHT		},
-    { EL_CONVEYOR_BELT1_SWITCH_LEFT,	GFX_BELT1_SWITCH_LEFT	},
-    { EL_CONVEYOR_BELT1_SWITCH_MIDDLE,	GFX_BELT1_SWITCH_MIDDLE	},
-    { EL_CONVEYOR_BELT1_SWITCH_RIGHT,	GFX_BELT1_SWITCH_RIGHT	},
-    { EL_CONVEYOR_BELT2_LEFT,		GFX_BELT2_LEFT		},
-    { EL_CONVEYOR_BELT2_MIDDLE,		GFX_BELT2_MIDDLE	},
-    { EL_CONVEYOR_BELT2_RIGHT,		GFX_BELT2_RIGHT		},
-    { EL_CONVEYOR_BELT2_LEFT_ACTIVE,	GFX_BELT2_LEFT		},
-    { EL_CONVEYOR_BELT2_MIDDLE_ACTIVE,	GFX_BELT2_MIDDLE	},
-    { EL_CONVEYOR_BELT2_RIGHT_ACTIVE,	GFX_BELT2_RIGHT		},
-    { EL_CONVEYOR_BELT2_SWITCH_LEFT,	GFX_BELT2_SWITCH_LEFT	},
-    { EL_CONVEYOR_BELT2_SWITCH_MIDDLE,	GFX_BELT2_SWITCH_MIDDLE	},
-    { EL_CONVEYOR_BELT2_SWITCH_RIGHT,	GFX_BELT2_SWITCH_RIGHT	},
-    { EL_CONVEYOR_BELT3_LEFT,		GFX_BELT3_LEFT		},
-    { EL_CONVEYOR_BELT3_MIDDLE,		GFX_BELT3_MIDDLE	},
-    { EL_CONVEYOR_BELT3_RIGHT,		GFX_BELT3_RIGHT		},
-    { EL_CONVEYOR_BELT3_LEFT_ACTIVE,	GFX_BELT3_LEFT		},
-    { EL_CONVEYOR_BELT3_MIDDLE_ACTIVE,	GFX_BELT3_MIDDLE	},
-    { EL_CONVEYOR_BELT3_RIGHT_ACTIVE,	GFX_BELT3_RIGHT		},
-    { EL_CONVEYOR_BELT3_SWITCH_LEFT,	GFX_BELT3_SWITCH_LEFT	},
-    { EL_CONVEYOR_BELT3_SWITCH_MIDDLE,	GFX_BELT3_SWITCH_MIDDLE	},
-    { EL_CONVEYOR_BELT3_SWITCH_RIGHT,	GFX_BELT3_SWITCH_RIGHT	},
-    { EL_CONVEYOR_BELT4_LEFT,		GFX_BELT4_LEFT		},
-    { EL_CONVEYOR_BELT4_MIDDLE,		GFX_BELT4_MIDDLE	},
-    { EL_CONVEYOR_BELT4_RIGHT,		GFX_BELT4_RIGHT		},
-    { EL_CONVEYOR_BELT4_LEFT_ACTIVE,	GFX_BELT4_LEFT		},
-    { EL_CONVEYOR_BELT4_MIDDLE_ACTIVE,	GFX_BELT4_MIDDLE	},
-    { EL_CONVEYOR_BELT4_RIGHT_ACTIVE,	GFX_BELT4_RIGHT		},
-    { EL_CONVEYOR_BELT4_SWITCH_LEFT,	GFX_BELT4_SWITCH_LEFT	},
-    { EL_CONVEYOR_BELT4_SWITCH_MIDDLE,	GFX_BELT4_SWITCH_MIDDLE	},
-    { EL_CONVEYOR_BELT4_SWITCH_RIGHT,	GFX_BELT4_SWITCH_RIGHT	},
-    { EL_LANDMINE,			GFX_LANDMINE		},
-    { EL_ENVELOPE,			GFX_ENVELOPE		},
-    { EL_LIGHT_SWITCH,			GFX_LIGHT_SWITCH_OFF	},
-    { EL_LIGHT_SWITCH_ACTIVE,		GFX_LIGHT_SWITCH_ON	},
-    { EL_SIGN_EXCLAMATION,		GFX_SIGN_EXCLAMATION	},
-    { EL_SIGN_RADIOACTIVITY,		GFX_SIGN_RADIOACTIVITY	},
-    { EL_SIGN_STOP,			GFX_SIGN_STOP		},
-    { EL_SIGN_WHEELCHAIR,		GFX_SIGN_WHEELCHAIR	},
-    { EL_SIGN_PARKING,			GFX_SIGN_PARKING	},
-    { EL_SIGN_ONEWAY,			GFX_SIGN_ONEWAY		},
-    { EL_SIGN_HEART,			GFX_SIGN_HEART		},
-    { EL_SIGN_TRIANGLE,			GFX_SIGN_TRIANGLE	},
-    { EL_SIGN_ROUND,			GFX_SIGN_ROUND		},
-    { EL_SIGN_EXIT,			GFX_SIGN_EXIT		},
-    { EL_SIGN_YINYANG,			GFX_SIGN_YINYANG	},
-    { EL_SIGN_OTHER,			GFX_SIGN_OTHER		},
-    { EL_MOLE_LEFT,			GFX_MOLE_LEFT		},
-    { EL_MOLE_RIGHT,			GFX_MOLE_RIGHT		},
-    { EL_MOLE_UP,			GFX_MOLE_UP		},
-    { EL_MOLE_DOWN,			GFX_MOLE_DOWN		},
-    { EL_STEELWALL_SLANTED,		GFX_STEEL_SLANTED	},
-    { EL_INVISIBLE_SAND,		GFX_SAND_INVISIBLE	},
-    { EL_INVISIBLE_SAND_ACTIVE,		GFX_SAND_INVISIBLE_ON	},
-    { EL_DX_UNKNOWN_15,			GFX_DX_UNKNOWN_15	},
-    { EL_DX_UNKNOWN_42,			GFX_DX_UNKNOWN_42	},
-    { EL_TIMEGATE_OPEN,			GFX_TIMEGATE_OPEN	},
-    { EL_TIMEGATE_CLOSED,		GFX_TIMEGATE_CLOSED	},
-    { EL_TIMEGATE_SWITCH_ACTIVE,	GFX_TIMEGATE_SWITCH	},
-    { EL_TIMEGATE_SWITCH,		GFX_TIMEGATE_SWITCH	},
-    { EL_BALLOON,			GFX_BALLOON		},
-    { EL_BALLOON_SEND_LEFT,		GFX_BALLOON_SEND_LEFT	},
-    { EL_BALLOON_SEND_RIGHT,		GFX_BALLOON_SEND_RIGHT	},
-    { EL_BALLOON_SEND_UP,		GFX_BALLOON_SEND_UP	},
-    { EL_BALLOON_SEND_DOWN,		GFX_BALLOON_SEND_DOWN	},
-    { EL_BALLOON_SEND_ANY_DIRECTION,	GFX_BALLOON_SEND_ANY	},
-    { EL_EMC_STEELWALL1,		GFX_EMC_STEEL_WALL_1	},
-    { EL_EMC_STEELWALL2,		GFX_EMC_STEEL_WALL_2	},
-    { EL_EMC_STEELWALL3,		GFX_EMC_STEEL_WALL_3	},
-    { EL_EMC_STEELWALL4,		GFX_EMC_STEEL_WALL_4	},
-    { EL_EMC_WALL_PILLAR_UPPER,		GFX_EMC_WALL_1		},
-    { EL_EMC_WALL_PILLAR_MIDDLE,	GFX_EMC_WALL_2		},
-    { EL_EMC_WALL_PILLAR_LOWER,		GFX_EMC_WALL_3		},
-    { EL_EMC_WALL4,			GFX_EMC_WALL_4		},
-    { EL_EMC_WALL5,			GFX_EMC_WALL_5		},
-    { EL_EMC_WALL6,			GFX_EMC_WALL_6		},
-    { EL_EMC_WALL7,			GFX_EMC_WALL_7		},
-    { EL_EMC_WALL8,			GFX_EMC_WALL_8		},
-    { EL_TUBE_ALL,			GFX_TUBE_CROSS		},
-    { EL_TUBE_VERTICAL,			GFX_TUBE_VERTICAL	},
-    { EL_TUBE_HORIZONTAL,		GFX_TUBE_HORIZONTAL	},
-    { EL_TUBE_VERTICAL_LEFT,		GFX_TUBE_VERT_LEFT	},
-    { EL_TUBE_VERTICAL_RIGHT,		GFX_TUBE_VERT_RIGHT	},
-    { EL_TUBE_HORIZONTAL_UP,		GFX_TUBE_HORIZ_UP	},
-    { EL_TUBE_HORIZONTAL_DOWN,		GFX_TUBE_HORIZ_DOWN	},
-    { EL_TUBE_LEFT_UP,			GFX_TUBE_LEFT_UP	},
-    { EL_TUBE_LEFT_DOWN,		GFX_TUBE_LEFT_DOWN	},
-    { EL_TUBE_RIGHT_UP,			GFX_TUBE_RIGHT_UP	},
-    { EL_TUBE_RIGHT_DOWN,		GFX_TUBE_RIGHT_DOWN	},
-    { EL_SPRING,			GFX_SPRING		},
-    { EL_SPRING_MOVING,			GFX_SPRING		},
-    { EL_TRAP,				GFX_TRAP_INACTIVE	},
-    { EL_TRAP_ACTIVE,			GFX_TRAP_ACTIVE		},
-    { EL_BD_WALL,			GFX_BD_WALL		},
-    { EL_BD_ROCK,			GFX_BD_ROCK		},
-    { EL_DX_SUPABOMB,			GFX_DX_SUPABOMB		},
-    { EL_SP_MURPHY_CLONE,		GFX_SP_MURPHY_CLONE	},
-    { -1,				-1			}
-  };
-
-  static struct
-  {
-    int element;
-    int graphic_left;
-    int graphic_right;
-    int graphic_up;
-    int graphic_down;
-  }
-  element_to_direction_graphic[] =
-  {
-    {
-      EL_PLAYER1,
-      IMG_PLAYER1_LEFT,		IMG_PLAYER1_RIGHT,
-      IMG_PLAYER1_UP,		IMG_PLAYER1_DOWN
-    },
-    {
-      EL_PLAYER2,
-      IMG_PLAYER2_LEFT,		IMG_PLAYER2_RIGHT,
-      IMG_PLAYER2_UP,		IMG_PLAYER2_DOWN
-    },
-    {
-      EL_PLAYER3,
-      IMG_PLAYER3_LEFT,		IMG_PLAYER3_RIGHT,
-      IMG_PLAYER3_UP,		IMG_PLAYER3_DOWN
-    },
-    {
-      EL_PLAYER4,
-      IMG_PLAYER4_LEFT,		IMG_PLAYER4_RIGHT,
-      IMG_PLAYER4_UP,		IMG_PLAYER4_DOWN
-    },
-    {
-      EL_SP_MURPHY,
-      IMG_SP_MURPHY_LEFT,	IMG_SP_MURPHY_RIGHT,
-      IMG_SP_MURPHY_UP,		IMG_SP_MURPHY_DOWN
-    },
-    {
-      EL_SP_SNIKSNAK,
-      IMG_SP_SNIKSNAK_LEFT,	IMG_SP_SNIKSNAK_RIGHT,
-      IMG_SP_SNIKSNAK_UP,	IMG_SP_SNIKSNAK_DOWN
-    },
-    {
-      EL_BUG,
-      IMG_BUG_LEFT,		IMG_BUG_RIGHT,
-      IMG_BUG_UP,		IMG_BUG_DOWN
-    },
-    {
-      EL_SPACESHIP,
-      IMG_SPACESHIP_LEFT,	IMG_SPACESHIP_RIGHT,
-      IMG_SPACESHIP_UP,		IMG_SPACESHIP_DOWN
-    },
-    {
-      EL_PACMAN,
-      IMG_PACMAN_LEFT,		IMG_PACMAN_RIGHT,
-      IMG_PACMAN_UP,		IMG_PACMAN_DOWN
-    },
-    {
-      EL_MOLE,
-      IMG_MOLE_LEFT,		IMG_MOLE_RIGHT,
-      IMG_MOLE_UP,		IMG_MOLE_DOWN
-    },
-    {
-      EL_PENGUIN,
-      IMG_PENGUIN_LEFT,		IMG_PENGUIN_RIGHT,
-      IMG_PENGUIN_UP,		IMG_PENGUIN_DOWN
-    },
-    {
-      EL_PIG,
-      IMG_PIG_LEFT,		IMG_PIG_RIGHT,
-      IMG_PIG_UP,		IMG_PIG_DOWN
-    },
-    {
-      EL_DRAGON,
-      IMG_DRAGON_LEFT,		IMG_DRAGON_RIGHT,
-      IMG_DRAGON_UP,		IMG_DRAGON_DOWN
-    },
-    {
-      -1,
-      -1,			-1,
-      -1,			-1
-    }
-  };
-#endif
-
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
   int i, act, dir;
 
   /* set values to -1 to identify later as "uninitialized" values */
-  for (i=0; i<MAX_ELEMENTS; i++)
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    for (act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
+    for (act=0; act<NUM_ACTIONS; act++)
     {
       element_info[i].graphic[act] = -1;
 
-      for (dir=0; dir<NUM_MV_DIRECTIONS; dir++)
+      for (dir=0; dir<NUM_DIRECTIONS; dir++)
 	element_info[i].direction_graphic[act][dir] = -1;
     }
   }
 
-#if 0
-  for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
-    element_info[i].graphic[GFX_ACTION_DEFAULT] =
-      GFX_CHAR_START + (i - EL_CHAR_START);
-#else
-  for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
-    element_info[i].graphic[GFX_ACTION_DEFAULT] =
-      IMG_CHAR_START + (i - EL_CHAR_START);
-#endif
-
-#if 0
-  for (i=EL_SP_START; i<=EL_SP_END; i++)
+  /* initialize normal element/graphic mapping from static configuration */
+  for (i=0; element_to_graphic[i].element > -1; i++)
   {
-    int nr_element = i - EL_SP_START;
-    int gfx_per_line = 8;
-    int nr_graphic =
-      (nr_element / gfx_per_line) * SP_PER_LINE +
-      (nr_element % gfx_per_line);
+    int element   = element_to_graphic[i].element;
+    int action    = element_to_graphic[i].action;
+    int direction = element_to_graphic[i].direction;
+    int graphic   = element_to_graphic[i].graphic;
 
-    element_info[i].graphic[GFX_ACTION_DEFAULT] =
-      GFX_START_ROCKSSP + nr_graphic;
-  }
-#endif
+    if (graphic_info[graphic].bitmap == NULL)
+      continue;
 
-#if 0
-  /* this overrides some of the above default settings (GFX_SP_ZONK etc.) */
-  i = 0;
-  while (element_to_graphic[i].element > -1)
-  {
-    int element = element_to_graphic[i].element;
-    int graphic = element_to_graphic[i].graphic;
+    if (action < 0)
+      action = ACTION_DEFAULT;
 
-    element_info[element].graphic[GFX_ACTION_DEFAULT] = graphic;
-    i++;
+    if (direction > -1)
+      element_info[element].direction_graphic[action][direction] = graphic;
+    else
+      element_info[element].graphic[action] = graphic;
   }
 
-  /* this initializes special graphics for left/right/up/down directions */
-  i = 0;
-  while (element_to_direction_graphic[i].element > -1)
+  /* initialize normal element/graphic mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
   {
-    int element = element_to_direction_graphic[i].element;
-
-    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_LEFT] =
-      element_to_direction_graphic[i].graphic_left;
-    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_RIGHT] =
-      element_to_direction_graphic[i].graphic_right;
-    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_UP] =
-      element_to_direction_graphic[i].graphic_up;
-    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_DOWN] =
-      element_to_direction_graphic[i].graphic_down;
+    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;
 
-    element_info[element].has_direction_graphic[GFX_ACTION_DEFAULT] = TRUE;
-    i++;
-  }
-#else
+    if (graphic_info[graphic].bitmap == NULL)
+      continue;
 
-  i = 0;
-  while (element_to_graphic[i].element > -1)
-  {
-    int element   = element_to_graphic[i].element;
-    int direction = element_to_graphic[i].direction;
-    int action    = element_to_graphic[i].action;
-    int graphic   = element_to_graphic[i].graphic;
+    if (element >= MAX_NUM_ELEMENTS || special != -1)
+      continue;
 
-    if (action > -1)
-      action = graphics_action_mapping[action];
-    else
-      action = GFX_ACTION_DEFAULT;
+    if (action < 0)
+      action = ACTION_DEFAULT;
 
     if (direction > -1)
-    {
-      direction = MV_DIR_BIT(direction);
-
       element_info[element].direction_graphic[action][direction] = graphic;
-    }
     else
       element_info[element].graphic[action] = graphic;
-
-    i++;
   }
 
   /* now set all '-1' values to element specific default values */
-  for (i=0; i<MAX_ELEMENTS; i++)
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    int default_action_graphic = element_info[i].graphic[GFX_ACTION_DEFAULT];
-    int default_action_direction_graphic[NUM_MV_DIRECTIONS];
+    int default_action_graphic = element_info[i].graphic[ACTION_DEFAULT];
+    int default_action_direction_graphic[NUM_DIRECTIONS];
 
     if (default_action_graphic == -1)
       default_action_graphic = IMG_CHAR_QUESTION;
 
-    for (dir=0; dir<NUM_MV_DIRECTIONS; dir++)
+    for (dir=0; dir<NUM_DIRECTIONS; dir++)
     {
       default_action_direction_graphic[dir] =
-	element_info[i].direction_graphic[GFX_ACTION_DEFAULT][dir];
+	element_info[i].direction_graphic[ACTION_DEFAULT][dir];
 
       if (default_action_direction_graphic[dir] == -1)
 	default_action_direction_graphic[dir] = default_action_graphic;
     }
 
-    for (act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
+    for (act=0; act<NUM_ACTIONS; act++)
     {
-      for (dir=0; dir<NUM_MV_DIRECTIONS; dir++)
+      boolean act_empty = (act == ACTION_DIGGING ||
+			   act == ACTION_SNAPPING ||
+			   act == ACTION_COLLECTING);
+
+      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];
+	  default_direction_graphic =
+	    (act_empty ? IMG_EMPTY : default_action_direction_graphic[dir]);
 
 	if (element_info[i].direction_graphic[act][dir] == -1)
 	  element_info[i].direction_graphic[act][dir] =
@@ -1143,248 +511,623 @@ void InitElementInfo()
 
       /* 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;
+	element_info[i].graphic[act] =
+	  (act_empty ? IMG_EMPTY : default_action_graphic);
     }
   }
 
+#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
 }
 
-static void InitGraphicInfo()
+void InitElementSpecialGraphicInfo()
 {
-  static int gfx_action[NUM_IMAGE_FILES];
-  Bitmap *src_bitmap;
-  int src_x, src_y;
-  int last_frame;
-  int i;
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
+  int i, j;
 
-  image_files = getCurrentImageList();
+  /* 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];
 
-#if 0
-  for (i=0; i<MAX_GRAPHICS; i++)
+  /* initialize special element/graphic mapping from static configuration */
+  for (i=0; element_to_special_graphic[i].element > -1; i++)
   {
-    /* always start with reliable default values */
-    graphic_info[i].bitmap = NULL;
-    graphic_info[i].src_x = 0;
-    graphic_info[i].src_y = 0;
+    int element = element_to_special_graphic[i].element;
+    int special = element_to_special_graphic[i].special;
+    int graphic = element_to_special_graphic[i].graphic;
+    boolean base_redefined = getImageListEntry(el2img(element))->redefined;
+    boolean special_redefined = getImageListEntry(graphic)->redefined;
 
-    getGraphicSource(i, &graphic_info[i].bitmap,
-		     &graphic_info[i].src_x, &graphic_info[i].src_y);
-  }
-#endif
+    if (base_redefined && !special_redefined)
+      continue;
 
-  /* set temporary graphics action field to default value */
-  for (i=0; i<NUM_IMAGE_FILES; i++)
-    gfx_action[i] = GFX_ACTION_DEFAULT;
+    element_info[element].special_graphic[special] = graphic;
+  }
 
-  /* set temporary graphics action field from element_to_graphic list */
-  i = 0;
-  while (element_to_graphic[i].element > -1)
+  /* initialize special element/graphic mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
   {
-    int action    = element_to_graphic[i].action;
-    int graphic   = element_to_graphic[i].graphic;
+    int element = property_mapping[i].base_index;
+    int special = property_mapping[i].ext3_index;
+    int graphic = property_mapping[i].artwork_index;
+
+    if (element >= MAX_NUM_ELEMENTS)
+      continue;
 
-    if (action == -1)
-      action = GFX_ACTION_DEFAULT;
+    if (special >= 0 && special < NUM_SPECIAL_GFX_ARGS)
+      element_info[element].special_graphic[special] = graphic;
+  }
+}
 
-    gfx_action[graphic] = action;
+static void set_graphic_parameters(int graphic, char **parameter_raw)
+{
+  Bitmap *src_bitmap = getBitmapFromImageID(graphic);
+  int parameter[NUM_GFX_ARGS];
+  int anim_frames_per_row = 1, anim_frames_per_col = 1;
+  int anim_frames_per_line = 1;
+  int i;
 
-    i++;
+  /* 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];
+
+  if (src_bitmap)
+  {
+    anim_frames_per_row = src_bitmap->width  / graphic_info[graphic].width;
+    anim_frames_per_col = src_bitmap->height / graphic_info[graphic].height;
   }
 
-  for (i=0; i<NUM_IMAGE_FILES; i++)
+  /* correct x or y offset dependant of vertical or horizontal frame order */
+  if (parameter[GFX_ARG_VERTICAL])	/* frames are ordered vertically */
   {
-    int *parameter = image_files[i].parameter;
+    graphic_info[graphic].offset_y =
+      (parameter[GFX_ARG_OFFSET] != ARG_UNDEFINED_VALUE ?
+       parameter[GFX_ARG_OFFSET] : graphic_info[graphic].height);
+    anim_frames_per_line = anim_frames_per_col;
+  }
+  else					/* frames are ordered horizontally */
+  {
+    graphic_info[graphic].offset_x =
+      (parameter[GFX_ARG_OFFSET] != ARG_UNDEFINED_VALUE ?
+       parameter[GFX_ARG_OFFSET] : graphic_info[graphic].width);
+    anim_frames_per_line = anim_frames_per_row;
+  }
 
-    new_graphic_info[i].bitmap = getBitmapFromImageID(i);
+  /* 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 =	anim_frames_per_row;
+  else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL])
+    graphic_info[graphic].anim_frames =	anim_frames_per_col;
+  else
+    graphic_info[graphic].anim_frames = 1;
+
+  graphic_info[graphic].anim_frames_per_line =
+    (parameter[GFX_ARG_FRAMES_PER_LINE] != ARG_UNDEFINED_VALUE ?
+     parameter[GFX_ARG_FRAMES_PER_LINE] : anim_frames_per_line);
+
+  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;
+
+  graphic_info[graphic].anim_mode = parameter[GFX_ARG_ANIM_MODE];
+  if (graphic_info[graphic].anim_frames == 1)
+    graphic_info[graphic].anim_mode = ANIM_NONE;
+
+  /* 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];
+}
 
-    new_graphic_info[i].src_x = parameter[GFX_ARG_XPOS] * TILEX;
-    new_graphic_info[i].src_y = parameter[GFX_ARG_YPOS] * TILEY;
-    new_graphic_info[i].offset_x = parameter[GFX_ARG_OFFSET];
-    new_graphic_info[i].offset_y = 0;
+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;
 
-    /* animation frames are ordered vertically instead of horizontally */
-    if (parameter[GFX_ARG_VERTICAL])
-    {
-      new_graphic_info[i].offset_x = 0;
-      new_graphic_info[i].offset_y = parameter[GFX_ARG_OFFSET];
-    }
+#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
 
-    new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
-
-    new_graphic_info[i].anim_delay = parameter[GFX_ARG_DELAY];
-    if (new_graphic_info[i].anim_delay == 0)	/* delay must be at least 1 */
-      new_graphic_info[i].anim_delay = 1;
-
-    /* set mode for animation frame order */
-    if (parameter[GFX_ARG_MODE_LOOP])
-      new_graphic_info[i].anim_mode = ANIM_LOOP;
-    else if (parameter[GFX_ARG_MODE_LINEAR])
-      new_graphic_info[i].anim_mode = ANIM_LINEAR;
-    else if (parameter[GFX_ARG_MODE_PINGPONG])
-      new_graphic_info[i].anim_mode = ANIM_PINGPONG;
-    else if (parameter[GFX_ARG_MODE_PINGPONG2])
-      new_graphic_info[i].anim_mode = ANIM_PINGPONG2;
-    else if (parameter[GFX_ARG_FRAMES] > 1)
-      new_graphic_info[i].anim_mode = ANIM_LOOP;
-    else
-      new_graphic_info[i].anim_mode = ANIM_NONE;
+  if (graphic_info != NULL)
+    free(graphic_info);
 
-    /* set additional flag to play animation frames in reverse order */
-    if (parameter[GFX_ARG_MODE_REVERSE])
-      new_graphic_info[i].anim_mode |= ANIM_REVERSE;
+  graphic_info = checked_calloc(num_images * sizeof(struct GraphicInfo));
 
-#if 1
-    /* set first frame of animation after determining animation mode */
-    new_graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME];
-    if (new_graphic_info[i].anim_start_frame == -1)
-      new_graphic_info[i].anim_start_frame = 0;
-    else if (new_graphic_info[i].anim_mode & ANIM_REVERSE)
-      new_graphic_info[i].anim_start_frame =
-	new_graphic_info[i].anim_frames
-	- new_graphic_info[i].anim_start_frame - 1;
-#else
-    /* set first frame of animation after determining animation mode */
-    new_graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME];
-    if (parameter[GFX_ARG_START_FRAME] == -1)	/* default: start with ... */
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  if (clipmasks_initialized)
+  {
+    for (i=0; i<num_images; i++)
     {
-      if (parameter[GFX_ARG_MODE_REVERSE])
-	new_graphic_info[i].anim_start_frame =
-	  new_graphic_info[i].anim_frames - 1;		/* ... last frame */
-      else
-	new_graphic_info[i].anim_start_frame = 0;	/* ... first frame */
+      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
 
-#if 1
-    /* animation synchronized with global frame counter, not move position */
-    new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
-    if (parameter[GFX_ARG_GLOBAL_SYNC] == -1)
-      new_graphic_info[i].anim_global_sync =
-	(gfx_action[i] == GFX_ACTION_DEFAULT ? TRUE : FALSE);
-#else
-    /* animation synchronized with global frame counter, not move position */
-    new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
-#endif
+  for (i=0; i<num_images; i++)
+  {
+    struct FileInfo *image = getImageListEntry(i);
+    Bitmap *src_bitmap;
+    int src_x, src_y;
+    int first_frame, last_frame;
+
+    set_graphic_parameters(i, image->parameter);
+
+    /* now check if no animation frames are outside of the loaded image */
 
-    /* now check if the loaded image is large enough for the animation */
-    last_frame = new_graphic_info[i].anim_frames - 1;
+    if (graphic_info[i].bitmap == NULL)
+      continue;		/* skip check for optional images that are undefined */
 
+    first_frame = 0;
+    getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
+    if (src_x < 0 || src_y < 0 ||
+	src_x + TILEX > src_bitmap->width ||
+	src_y + TILEY > src_bitmap->height)
+    {
+      Error(ERR_RETURN_LINE, "-");
+      Error(ERR_RETURN, "warning: error found in config file:");
+      Error(ERR_RETURN, "- config file: '%s'",
+	    getImageConfigFilename());
+      Error(ERR_RETURN, "- config token: '%s'",
+	    getTokenFromImageID(i));
+      Error(ERR_RETURN, "- image file: '%s'",
+	    src_bitmap->source_filename);
+      Error(ERR_RETURN,
+	    "error: first animation frame out of bounds (%d, %d)",
+	    src_x, src_y);
+      Error(ERR_RETURN, "custom graphic rejected for this element/action");
+
+      if (i == fallback_graphic)
+	Error(ERR_EXIT, "fatal error: no fallback graphic available");
+
+      Error(ERR_RETURN, "fallback done to 'char_exclam' for this graphic");
+      Error(ERR_RETURN_LINE, "-");
+
+      set_graphic_parameters(i, fallback_image->default_parameter);
+      graphic_info[i].bitmap = fallback_bitmap;
+    }
+
+    last_frame = graphic_info[i].anim_frames - 1;
     getGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y);
-    if (src_x + TILEX > src_bitmap->width ||
+    if (src_x < 0 || src_y < 0 ||
+	src_x + TILEX > src_bitmap->width ||
 	src_y + TILEY > src_bitmap->height)
-      Error(ERR_EXIT, "InitGraphicInfo: image bitmap '%s' too small for graphic object %d (normal size)", src_bitmap->source_filename, i);
+    {
+      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;
+    }
 
-    getMiniGraphicSource(i, &src_bitmap, &src_x, &src_y);
-    if (src_x + MINI_TILEX > src_bitmap->width ||
-	src_y + MINI_TILEY > src_bitmap->height)
-      Error(ERR_EXIT, "InitGraphicInfo: image bitmap '%s' too small for graphic object %d ('mini' size)", src_bitmap->source_filename, i);
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+    /* currently we need only a tile clip mask from the first frame */
+    getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
+
+    if (copy_clipmask_gc == None)
+    {
+      clip_gc_values.graphics_exposures = False;
+      clip_gc_valuemask = GCGraphicsExposures;
+      copy_clipmask_gc = XCreateGC(display, src_bitmap->clip_mask,
+				   clip_gc_valuemask, &clip_gc_values);
+    }
 
-    getMicroGraphicSource(i, &src_bitmap, &src_x, &src_y);
-    if (src_x + MICRO_TILEX > src_bitmap->width ||
-	src_y + MICRO_TILEY > src_bitmap->height)
-      Error(ERR_EXIT, "InitGraphicInfo: image bitmap '%s' too small for graphic object %d ('micro' size)", src_bitmap->source_filename, i);
+    graphic_info[i].clip_mask =
+      XCreatePixmap(display, window->drawable, TILEX, TILEY, 1);
 
+    src_pixmap = src_bitmap->clip_mask;
+    XCopyArea(display, src_pixmap, graphic_info[i].clip_mask,
+	      copy_clipmask_gc, src_x, src_y, TILEX, TILEY, 0, 0);
 
-#if 0
-    {
-      int j;
+    clip_gc_values.graphics_exposures = False;
+    clip_gc_values.clip_mask = graphic_info[i].clip_mask;
+    clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
 
-      if (i == IMG_EMERALD)
-      {
-	for (j=0; j<NUM_GFX_ARGS; j++)
-	  printf("%s -> %d\n", image_config_suffix[j].token, parameter[j]);
-	printf("-> %d\n", new_graphic_info[i].anim_frames);
-	printf("\n");
-      }
-    }
+    graphic_info[i].clip_gc =
+      XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
 #endif
-
   }
 
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  if (copy_clipmask_gc)
+    XFreeGC(display, copy_clipmask_gc);
 
-#if 0
-  printf("D> %d\n", image_files[GFX_BD_DIAMOND].parameter[GFX_ARG_NUM_FRAMES]);
-  printf("W> %d\n", image_files[GFX_ROBOT_WHEEL].parameter[GFX_ARG_NUM_FRAMES]);
-
-  graphic_info[GFX_ABLENK].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
-  graphic_info[GFX_ABLENK].src_x = 0;
-  graphic_info[GFX_ABLENK].src_y = 0;
-
-  graphic_info[GFX_ABLENK + 1].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
-  graphic_info[GFX_ABLENK + 2].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
-  graphic_info[GFX_ABLENK + 3].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
-  graphic_info[GFX_ABLENK + 1].src_x = 1 * TILEX;
-  graphic_info[GFX_ABLENK + 2].src_x = 2 * TILEX;
-  graphic_info[GFX_ABLENK + 3].src_x = 3 * TILEX;
-  graphic_info[GFX_ABLENK + 1].src_y = 0;
-  graphic_info[GFX_ABLENK + 2].src_y = 0;
-  graphic_info[GFX_ABLENK + 3].src_y = 0;
+  clipmasks_initialized = TRUE;
 #endif
 }
 
-static void InitSoundInfo()
+static void InitElementSoundInfo()
 {
-  sound_files = getCurrentSoundList();
-
-  /* initialize sound effect lookup table for element actions */
-  InitGameSound();
-}
+  struct PropertyMapping *property_mapping = getSoundListPropertyMapping();
+  int num_property_mappings = getSoundListPropertyMappingSize();
+  int i, j, act;
 
-void InitElementProperties()
-{
-  int i, j;
+  /* set values to -1 to identify later as "uninitialized" values */
+  for (i=0; i < MAX_NUM_ELEMENTS; i++)
+    for (act=0; act < NUM_ACTIONS; act++)
+      element_info[i].sound[act] = -1;
 
-  static int ep_amoebalive[] =
+  /* initialize element/sound mapping from static configuration */
+  for (i=0; element_to_sound[i].element > -1; i++)
   {
-    EL_AMOEBA_WET,
-    EL_AMOEBA_DRY,
-    EL_AMOEBA_FULL,
-    EL_BD_AMOEBA
-  };
-  static int ep_amoebalive_num = SIZEOF_ARRAY_INT(ep_amoebalive);
+    int element      = element_to_sound[i].element;
+    int action       = element_to_sound[i].action;
+    int sound        = element_to_sound[i].sound;
+    boolean is_class = element_to_sound[i].is_class;
 
-  static int ep_amoeboid[] =
+    if (action < 0)
+      action = ACTION_DEFAULT;
+
+    if (!is_class)
+      element_info[element].sound[action] = sound;
+    else
+      for (j=0; j < MAX_NUM_ELEMENTS; j++)
+	if (strcmp(element_info[j].class_name,
+		   element_info[element].class_name) == 0)
+	  element_info[j].sound[action] = sound;
+  }
+
+  /* initialize element/sound mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
   {
-    EL_AMOEBA_DEAD,
-    EL_AMOEBA_WET,
-    EL_AMOEBA_DRY,
-    EL_AMOEBA_FULL,
-    EL_BD_AMOEBA
-  };
-  static int ep_amoeboid_num = SIZEOF_ARRAY_INT(ep_amoeboid);
-
-  static int ep_schluessel[] =
-  {
-    EL_KEY1,
-    EL_KEY2,
-    EL_KEY3,
-    EL_KEY4,
-    EL_EM_KEY1,
-    EL_EM_KEY2,
-    EL_EM_KEY3,
-    EL_EM_KEY4
-  };
-  static int ep_schluessel_num = SIZEOF_ARRAY_INT(ep_schluessel);
+    int element = property_mapping[i].base_index;
+    int action  = property_mapping[i].ext1_index;
+    int sound   = property_mapping[i].artwork_index;
+
+    if (element >= MAX_NUM_ELEMENTS)
+      continue;
+
+    if (action < 0)
+      action = ACTION_DEFAULT;
+
+    element_info[element].sound[action] = sound;
+  }
+
+  /* initialize element class/sound mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
+  {
+    int element_class = property_mapping[i].base_index - MAX_NUM_ELEMENTS;
+    int action        = property_mapping[i].ext1_index;
+    int sound         = property_mapping[i].artwork_index;
+
+    if (element_class < 0 || element_class >= MAX_NUM_ELEMENTS)
+      continue;
+
+    if (action < 0)
+      action = ACTION_DEFAULT;
+
+    for (j=0; j < MAX_NUM_ELEMENTS; j++)
+      if (strcmp(element_info[j].class_name,
+		 element_info[element_class].class_name) == 0)
+	element_info[j].sound[action] = sound;
+  }
+
+  /* now set all '-1' values to element specific default values */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  {
+    int default_action_sound = element_info[i].sound[ACTION_DEFAULT];
+
+    for (act=0; act < NUM_ACTIONS; act++)
+    {
+      /* no sound for this specific action -- use default action sound */
+      if (element_info[i].sound[act] == -1)
+	element_info[i].sound[act] = default_action_sound;
+    }
+  }
+}
+
+static void set_sound_parameters(int sound, char **parameter_raw)
+{
+  int parameter[NUM_SND_ARGS];
+  int i;
+
+  /* get integer values from string parameters */
+  for (i=0; i < NUM_SND_ARGS; i++)
+    parameter[i] =
+      get_parameter_value(sound_config_suffix[i].token, parameter_raw[i],
+			  sound_config_suffix[i].type);
+
+  /* explicit loop mode setting in configuration overrides default value */
+  if (parameter[SND_ARG_MODE_LOOP] != ARG_UNDEFINED_VALUE)
+    sound_info[sound].loop = parameter[SND_ARG_MODE_LOOP];
+}
+
+static void InitSoundInfo()
+{
+  struct PropertyMapping *property_mapping = getSoundListPropertyMapping();
+  int num_property_mappings = getSoundListPropertyMappingSize();
+  int *sound_effect_properties;
+  int num_sounds = getSoundListSize();
+  int i, j;
+
+  if (sound_info != NULL)
+    free(sound_info);
+
+  sound_effect_properties = checked_calloc(num_sounds * sizeof(int));
+  sound_info = checked_calloc(num_sounds * sizeof(struct SoundInfo));
+
+  /* initialize sound effect for all elements to "no sound" */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+    for (j=0; j<NUM_ACTIONS; j++)
+      element_info[i].sound[j] = SND_UNDEFINED;
+
+  for (i=0; i<num_sounds; i++)
+  {
+    struct FileInfo *sound = getSoundListEntry(i);
+    int len_effect_text = strlen(sound->token);
+
+    sound_effect_properties[i] = ACTION_OTHER;
+    sound_info[i].loop = FALSE;
+
+    /* determine all loop sounds and identify certain sound classes */
+
+    for (j=0; element_action_info[j].suffix; j++)
+    {
+      int len_action_text = strlen(element_action_info[j].suffix);
+
+      if (len_action_text < len_effect_text &&
+	  strcmp(&sound->token[len_effect_text - len_action_text],
+		 element_action_info[j].suffix) == 0)
+      {
+	sound_effect_properties[i] = element_action_info[j].value;
+
+	if (element_action_info[j].is_loop_sound)
+	  sound_info[i].loop = TRUE;
+      }
+    }
+
+    /* associate elements and some selected sound actions */
+
+    for (j=0; j<MAX_NUM_ELEMENTS; j++)
+    {
+      if (element_info[j].class_name)
+      {
+	int len_class_text = strlen(element_info[j].class_name);
+
+	if (len_class_text + 1 < len_effect_text &&
+	    strncmp(sound->token,
+		    element_info[j].class_name, len_class_text) == 0 &&
+	    sound->token[len_class_text] == '.')
+	{
+	  int sound_action_value = sound_effect_properties[i];
+
+	  element_info[j].sound[sound_action_value] = i;
+	}
+      }
+    }
+
+    set_sound_parameters(i, sound->parameter);
+  }
+
+  free(sound_effect_properties);
+
+  /* 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;
+  }
+
+#if 0
+  /* TEST ONLY */
+  {
+    int element = EL_CUSTOM_11;
+    int j = 0;
+
+    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++;
+    }
+  }
+
+  PlaySoundLevelElementAction(0,0, EL_CUSTOM_11, ACTION_PUSHING);
+#endif
+
+#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
+}
+
+static void ReinitializeGraphics()
+{
+  InitGraphicInfo();			/* graphic properties mapping */
+  InitElementGraphicInfo();		/* element game graphic mapping */
+  InitElementSpecialGraphicInfo();	/* element special graphic mapping */
+
+  InitElementSmallImages();		/* create editor and preview images */
+  InitFontGraphicInfo();		/* initialize text drawing functions */
+
+  SetMainBackgroundImage(IMG_BACKGROUND);
+  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
+
+  InitGadgets();
+  InitToons();
+}
+
+static void ReinitializeSounds()
+{
+  InitSoundInfo();		/* sound properties mapping */
+  InitElementSoundInfo();	/* element game sound mapping */
+
+#if 1
+  InitElementSoundInfo();	/* element game sound mapping */
+#endif
+
+  InitPlaySoundLevel();		/* internal game sound settings */
+}
+
+static void ReinitializeMusic()
+{
+  /* currently nothing to do */
+}
+
+void InitElementProperties()
+{
+  int i, j;
+
+  static int ep_amoebalive[] =
+  {
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    -1
+  };
+
+  static int ep_amoeboid[] =
+  {
+    EL_AMOEBA_DEAD,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    -1
+  };
+
+  static int ep_can_be_crumbled[] =
+  {
+    EL_SAND,
+    EL_LANDMINE,
+    EL_TRAP,
+    EL_TRAP_ACTIVE,
+    -1
+  };
 
   static int ep_pforte[] =
   {
-    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_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1393,7 +1136,7 @@ void InitElementProperties()
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
-    EL_TUBE_ALL,
+    EL_TUBE_ANY,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
     EL_TUBE_VERTICAL_LEFT,
@@ -1403,18 +1146,17 @@ void InitElementProperties()
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
-    EL_TUBE_RIGHT_DOWN
+    EL_TUBE_RIGHT_DOWN,
+    -1
   };
-  static int ep_pforte_num = SIZEOF_ARRAY_INT(ep_pforte);
 
   static int ep_solid[] =
   {
-    EL_STEELWALL,
     EL_WALL,
-    EL_WALL_GROWING,
-    EL_WALL_GROWING_X,
-    EL_WALL_GROWING_Y,
-    EL_WALL_GROWING_XY,
+    EL_EXPANDABLE_WALL,
+    EL_EXPANDABLE_WALL_HORIZONTAL,
+    EL_EXPANDABLE_WALL_VERTICAL,
+    EL_EXPANDABLE_WALL_ANY,
     EL_BD_WALL,
     EL_WALL_CRUMBLED,
     EL_EXIT_CLOSED,
@@ -1425,8 +1167,8 @@ void InitElementProperties()
     EL_AMOEBA_DRY,
     EL_AMOEBA_FULL,
     EL_BD_AMOEBA,
-    EL_QUICKSAND_FULL,
     EL_QUICKSAND_EMPTY,
+    EL_QUICKSAND_FULL,
     EL_QUICKSAND_FILLING,
     EL_QUICKSAND_EMPTYING,
     EL_MAGIC_WALL,
@@ -1441,55 +1183,72 @@ void InitElementProperties()
     EL_BD_MAGIC_WALL_FULL,
     EL_BD_MAGIC_WALL_FILLING,
     EL_BD_MAGIC_WALL_DEAD,
-    EL_GAMEOFLIFE,
+    EL_GAME_OF_LIFE,
     EL_BIOMAZE,
-    EL_ACIDPOOL_TOPLEFT,
-    EL_ACIDPOOL_TOPRIGHT,
-    EL_ACIDPOOL_BOTTOMLEFT,
-    EL_ACIDPOOL_BOTTOM,
-    EL_ACIDPOOL_BOTTOMRIGHT,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
-    EL_SP_CHIP_UPPER,
-    EL_SP_CHIP_LOWER,
-    EL_SP_HARD_GRAY,
-    EL_SP_HARD_GREEN,
-    EL_SP_HARD_BLUE,
-    EL_SP_HARD_RED,
-    EL_SP_HARD_YELLOW,
-    EL_SP_HARD_BASE1,
-    EL_SP_HARD_BASE2,
-    EL_SP_HARD_BASE3,
-    EL_SP_HARD_BASE4,
-    EL_SP_HARD_BASE5,
-    EL_SP_HARD_BASE6,
+    EL_SP_CHIP_TOP,
+    EL_SP_CHIP_BOTTOM,
     EL_SP_TERMINAL,
     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_CONVEYOR_BELT1_SWITCH_LEFT,
-    EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
-    EL_CONVEYOR_BELT1_SWITCH_RIGHT,
-    EL_CONVEYOR_BELT2_SWITCH_LEFT,
-    EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
-    EL_CONVEYOR_BELT2_SWITCH_RIGHT,
-    EL_CONVEYOR_BELT3_SWITCH_LEFT,
-    EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
-    EL_CONVEYOR_BELT3_SWITCH_RIGHT,
-    EL_CONVEYOR_BELT4_SWITCH_LEFT,
-    EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
-    EL_CONVEYOR_BELT4_SWITCH_RIGHT,
     EL_SWITCHGATE_SWITCH_UP,
     EL_SWITCHGATE_SWITCH_DOWN,
-    EL_LIGHT_SWITCH,
-    EL_LIGHT_SWITCH_ACTIVE,
     EL_TIMEGATE_SWITCH,
     EL_TIMEGATE_SWITCH_ACTIVE,
+    EL_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_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_ACID_POOL_TOPLEFT,
+    EL_ACID_POOL_TOPRIGHT,
+    EL_ACID_POOL_BOTTOMLEFT,
+    EL_ACID_POOL_BOTTOM,
+    EL_ACID_POOL_BOTTOMRIGHT,
+    EL_SP_HARDWARE_GRAY,
+    EL_SP_HARDWARE_GREEN,
+    EL_SP_HARDWARE_BLUE,
+    EL_SP_HARDWARE_RED,
+    EL_SP_HARDWARE_YELLOW,
+    EL_SP_HARDWARE_BASE_1,
+    EL_SP_HARDWARE_BASE_2,
+    EL_SP_HARDWARE_BASE_3,
+    EL_SP_HARDWARE_BASE_4,
+    EL_SP_HARDWARE_BASE_5,
+    EL_SP_HARDWARE_BASE_6,
+    EL_INVISIBLE_STEELWALL,
+    EL_INVISIBLE_STEELWALL_ACTIVE,
+    EL_CONVEYOR_BELT_1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
+    EL_LIGHT_SWITCH,
+    EL_LIGHT_SWITCH_ACTIVE,
     EL_SIGN_EXCLAMATION,
     EL_SIGN_RADIOACTIVITY,
     EL_SIGN_STOP,
@@ -1503,37 +1262,27 @@ void InitElementProperties()
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
     EL_STEELWALL_SLANTED,
-    EL_EMC_STEELWALL1,
-    EL_EMC_STEELWALL2,
-    EL_EMC_STEELWALL3,
-    EL_EMC_STEELWALL4,
-    EL_EMC_WALL_PILLAR_UPPER,
-    EL_EMC_WALL_PILLAR_MIDDLE,
-    EL_EMC_WALL_PILLAR_LOWER,
-    EL_EMC_WALL4,
-    EL_EMC_WALL5,
-    EL_EMC_WALL6,
-    EL_EMC_WALL7,
-    EL_EMC_WALL8,
+    EL_EMC_STEELWALL_1,
+    EL_EMC_STEELWALL_2,
+    EL_EMC_STEELWALL_3,
+    EL_EMC_STEELWALL_4,
     EL_CRYSTAL,
-    EL_WALL_PEARL,
-    EL_WALL_CRYSTAL,
-    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_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1542,7 +1291,7 @@ void InitElementProperties()
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
-    EL_TUBE_ALL,
+    EL_TUBE_ANY,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
     EL_TUBE_VERTICAL_LEFT,
@@ -1552,44 +1301,44 @@ void InitElementProperties()
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
-    EL_TUBE_RIGHT_DOWN
+    EL_TUBE_RIGHT_DOWN,
+    -1
   };
-  static int ep_solid_num = SIZEOF_ARRAY_INT(ep_solid);
 
-  static int ep_massive[] =
+  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,
-    EL_SP_HARD_RED,
-    EL_SP_HARD_YELLOW,
-    EL_SP_HARD_BASE1,
-    EL_SP_HARD_BASE2,
-    EL_SP_HARD_BASE3,
-    EL_SP_HARD_BASE4,
-    EL_SP_HARD_BASE5,
-    EL_SP_HARD_BASE6,
+    EL_ACID_POOL_TOPLEFT,
+    EL_ACID_POOL_TOPRIGHT,
+    EL_ACID_POOL_BOTTOMLEFT,
+    EL_ACID_POOL_BOTTOM,
+    EL_ACID_POOL_BOTTOMRIGHT,
+    EL_SP_HARDWARE_GRAY,
+    EL_SP_HARDWARE_GREEN,
+    EL_SP_HARDWARE_BLUE,
+    EL_SP_HARDWARE_RED,
+    EL_SP_HARDWARE_YELLOW,
+    EL_SP_HARDWARE_BASE_1,
+    EL_SP_HARDWARE_BASE_2,
+    EL_SP_HARDWARE_BASE_3,
+    EL_SP_HARDWARE_BASE_4,
+    EL_SP_HARDWARE_BASE_5,
+    EL_SP_HARDWARE_BASE_6,
     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_CONVEYOR_BELT_1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
     EL_LIGHT_SWITCH,
     EL_LIGHT_SWITCH_ACTIVE,
     EL_SIGN_EXCLAMATION,
@@ -1605,27 +1354,27 @@ void InitElementProperties()
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
     EL_STEELWALL_SLANTED,
-    EL_EMC_STEELWALL1,
-    EL_EMC_STEELWALL2,
-    EL_EMC_STEELWALL3,
-    EL_EMC_STEELWALL4,
+    EL_EMC_STEELWALL_1,
+    EL_EMC_STEELWALL_2,
+    EL_EMC_STEELWALL_3,
+    EL_EMC_STEELWALL_4,
     EL_CRYSTAL,
-    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_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1634,7 +1383,7 @@ void InitElementProperties()
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
-    EL_TUBE_ALL,
+    EL_TUBE_ANY,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
     EL_TUBE_VERTICAL_LEFT,
@@ -1644,9 +1393,9 @@ void InitElementProperties()
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
-    EL_TUBE_RIGHT_DOWN
+    EL_TUBE_RIGHT_DOWN,
+    -1
   };
-  static int ep_massive_num = SIZEOF_ARRAY_INT(ep_massive);
 
   static int ep_slippery[] =
   {
@@ -1668,22 +1417,22 @@ void InitElementProperties()
     EL_TIME_ORB_EMPTY,
     EL_LAMP_ACTIVE,
     EL_LAMP,
-    EL_ACIDPOOL_TOPLEFT,
-    EL_ACIDPOOL_TOPRIGHT,
+    EL_ACID_POOL_TOPLEFT,
+    EL_ACID_POOL_TOPRIGHT,
     EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
-    EL_SP_CHIP_UPPER,
-    EL_SP_CHIP_LOWER,
+    EL_SP_CHIP_TOP,
+    EL_SP_CHIP_BOTTOM,
     EL_SPEED_PILL,
     EL_STEELWALL_SLANTED,
     EL_PEARL,
-    EL_CRYSTAL
+    EL_CRYSTAL,
+    -1
   };
-  static int ep_slippery_num = SIZEOF_ARRAY_INT(ep_slippery);
 
   static int ep_enemy[] =
   {
@@ -1696,56 +1445,56 @@ void InitElementProperties()
     EL_ROBOT,
     EL_PACMAN,
     EL_SP_SNIKSNAK,
-    EL_SP_ELECTRON
+    EL_SP_ELECTRON,
+    -1
   };
-  static int ep_enemy_num = SIZEOF_ARRAY_INT(ep_enemy);
 
   static int ep_mauer[] =
   {
     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_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_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_EXPANDABLE_WALL,
+    EL_EXPANDABLE_WALL_HORIZONTAL,
+    EL_EXPANDABLE_WALL_VERTICAL,
+    EL_EXPANDABLE_WALL_ANY,
+    EL_EXPANDABLE_WALL_GROWING,
     EL_BD_WALL,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
-    EL_SP_CHIP_UPPER,
-    EL_SP_CHIP_LOWER,
-    EL_SP_HARD_GRAY,
-    EL_SP_HARD_GREEN,
-    EL_SP_HARD_BLUE,
-    EL_SP_HARD_RED,
-    EL_SP_HARD_YELLOW,
-    EL_SP_HARD_BASE1,
-    EL_SP_HARD_BASE2,
-    EL_SP_HARD_BASE3,
-    EL_SP_HARD_BASE4,
-    EL_SP_HARD_BASE5,
-    EL_SP_HARD_BASE6,
+    EL_SP_CHIP_TOP,
+    EL_SP_CHIP_BOTTOM,
+    EL_SP_HARDWARE_GRAY,
+    EL_SP_HARDWARE_GREEN,
+    EL_SP_HARDWARE_BLUE,
+    EL_SP_HARDWARE_RED,
+    EL_SP_HARDWARE_YELLOW,
+    EL_SP_HARDWARE_BASE_1,
+    EL_SP_HARDWARE_BASE_2,
+    EL_SP_HARDWARE_BASE_3,
+    EL_SP_HARDWARE_BASE_4,
+    EL_SP_HARDWARE_BASE_5,
+    EL_SP_HARDWARE_BASE_6,
     EL_SP_TERMINAL,
     EL_SP_TERMINAL_ACTIVE,
     EL_SP_EXIT_CLOSED,
@@ -1755,20 +1504,20 @@ void InitElementProperties()
     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
+    EL_EMC_STEELWALL_1,
+    EL_EMC_STEELWALL_2,
+    EL_EMC_STEELWALL_3,
+    EL_EMC_STEELWALL_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,
+    -1
   };
-  static int ep_mauer_num = SIZEOF_ARRAY_INT(ep_mauer);
 
   static int ep_can_fall[] =
   {
@@ -1794,9 +1543,9 @@ void InitElementProperties()
     EL_PEARL,
     EL_CRYSTAL,
     EL_SPRING,
-    EL_DX_SUPABOMB
+    EL_DX_SUPABOMB,
+    -1
   };
-  static int ep_can_fall_num = SIZEOF_ARRAY_INT(ep_can_fall);
 
   static int ep_can_smash[] =
   {
@@ -1808,14 +1557,6 @@ void InitElementProperties()
     EL_EMERALD_RED,
     EL_EMERALD_PURPLE,
     EL_DIAMOND,
-    EL_KEY1,
-    EL_KEY2,
-    EL_KEY3,
-    EL_KEY4,
-    EL_EM_KEY1,
-    EL_EM_KEY2,
-    EL_EM_KEY3,
-    EL_EM_KEY4,
     EL_BOMB,
     EL_NUT,
     EL_AMOEBA_DROP,
@@ -1827,9 +1568,9 @@ void InitElementProperties()
     EL_PEARL,
     EL_CRYSTAL,
     EL_SPRING,
-    EL_DX_SUPABOMB
+    EL_DX_SUPABOMB,
+    -1
   };
-  static int ep_can_smash_num = SIZEOF_ARRAY_INT(ep_can_smash);
 
   static int ep_can_change[] =
   {
@@ -1840,9 +1581,9 @@ void InitElementProperties()
     EL_EMERALD_YELLOW,
     EL_EMERALD_RED,
     EL_EMERALD_PURPLE,
-    EL_DIAMOND
+    EL_DIAMOND,
+    -1
   };
-  static int ep_can_change_num = SIZEOF_ARRAY_INT(ep_can_change);
 
   static int ep_can_move[] =
   {
@@ -1862,9 +1603,9 @@ void InitElementProperties()
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
     EL_BALLOON,
-    EL_SPRING
+    EL_SPRING,
+    -1
   };
-  static int ep_can_move_num = SIZEOF_ARRAY_INT(ep_can_move);
 
   static int ep_could_move[] =
   {
@@ -1887,18 +1628,18 @@ void InitElementProperties()
     EL_PACMAN_RIGHT,
     EL_PACMAN_UP,
     EL_PACMAN_LEFT,
-    EL_PACMAN_DOWN
+    EL_PACMAN_DOWN,
+    -1
   };
-  static int ep_could_move_num = SIZEOF_ARRAY_INT(ep_could_move);
 
   static int ep_dont_touch[] =
   {
     EL_BUG,
     EL_SPACESHIP,
     EL_BD_BUTTERFLY,
-    EL_BD_FIREFLY
+    EL_BD_FIREFLY,
+    -1
   };
-  static int ep_dont_touch_num = SIZEOF_ARRAY_INT(ep_dont_touch);
 
   static int ep_dont_go_to[] =
   {
@@ -1916,11 +1657,11 @@ void InitElementProperties()
     EL_SP_ELECTRON,
     EL_SP_BUGGY_BASE_ACTIVE,
     EL_TRAP_ACTIVE,
-    EL_LANDMINE
+    EL_LANDMINE,
+    -1
   };
-  static int ep_dont_go_to_num = SIZEOF_ARRAY_INT(ep_dont_go_to);
 
-  static int ep_mampf2[] =
+  static int ep_food_dark_yamyam[] =
   {
     EL_SAND,
     EL_BUG,
@@ -1943,9 +1684,9 @@ void InitElementProperties()
     EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_PEARL,
-    EL_CRYSTAL
+    EL_CRYSTAL,
+    -1
   };
-  static int ep_mampf2_num = SIZEOF_ARRAY_INT(ep_mampf2);
 
   static int ep_bd_element[] =
   {
@@ -1960,7 +1701,7 @@ void InitElementProperties()
     EL_EXIT_CLOSED,
     EL_EXIT_OPEN,
     EL_STEELWALL,
-    EL_PLAYER1,
+    EL_PLAYER_1,
     EL_BD_FIREFLY,
     EL_BD_FIREFLY_1,
     EL_BD_FIREFLY_2,
@@ -1972,9 +1713,9 @@ void InitElementProperties()
     EL_BD_BUTTERFLY_3,
     EL_BD_BUTTERFLY_4,
     EL_BD_AMOEBA,
-    EL_CHAR_QUESTION
+    EL_CHAR_QUESTION,
+    -1
   };
-  static int ep_bd_element_num = SIZEOF_ARRAY_INT(ep_bd_element);
 
   static int ep_sb_element[] =
   {
@@ -1983,10 +1724,10 @@ void InitElementProperties()
     EL_SOKOBAN_OBJECT,
     EL_SOKOBAN_FIELD_EMPTY,
     EL_SOKOBAN_FIELD_FULL,
-    EL_PLAYER1,
-    EL_INVISIBLE_STEELWALL
+    EL_PLAYER_1,
+    EL_INVISIBLE_STEELWALL,
+    -1
   };
-  static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element);
 
   static int ep_gem[] =
   {
@@ -1995,9 +1736,9 @@ void InitElementProperties()
     EL_EMERALD_YELLOW,
     EL_EMERALD_RED,
     EL_EMERALD_PURPLE,
-    EL_DIAMOND
+    EL_DIAMOND,
+    -1
   };
-  static int ep_gem_num = SIZEOF_ARRAY_INT(ep_gem);
 
   static int ep_inactive[] =
   {
@@ -2011,30 +1752,30 @@ void InitElementProperties()
     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_KEY_1,
+    EL_KEY_2,
+    EL_KEY_3,
+    EL_KEY_4,
+    EL_EM_KEY_1,
+    EL_EM_KEY_2,
+    EL_EM_KEY_3,
+    EL_EM_KEY_4,
+    EL_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
     EL_DYNAMITE,
     EL_INVISIBLE_STEELWALL,
     EL_INVISIBLE_WALL,
@@ -2045,19 +1786,19 @@ void InitElementProperties()
     EL_WALL_DIAMOND,
     EL_WALL_BD_DIAMOND,
     EL_WALL_EMERALD_YELLOW,
-    EL_DYNABOMB_NR,
-    EL_DYNABOMB_SZ,
-    EL_DYNABOMB_XL,
+    EL_DYNABOMB_INCREASE_NUMBER,
+    EL_DYNABOMB_INCREASE_SIZE,
+    EL_DYNABOMB_INCREASE_POWER,
     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_ACID_POOL_TOPLEFT,
+    EL_ACID_POOL_TOPRIGHT,
+    EL_ACID_POOL_BOTTOMLEFT,
+    EL_ACID_POOL_BOTTOM,
+    EL_ACID_POOL_BOTTOMRIGHT,
     EL_MAGIC_WALL,
     EL_MAGIC_WALL_DEAD,
     EL_BD_MAGIC_WALL,
@@ -2066,47 +1807,47 @@ void InitElementProperties()
     EL_BLOCKED,
     EL_SP_EMPTY,
     EL_SP_BASE,
-    EL_SP_PORT1_RIGHT,
-    EL_SP_PORT1_DOWN,
-    EL_SP_PORT1_LEFT,
-    EL_SP_PORT1_UP,
-    EL_SP_PORT2_RIGHT,
-    EL_SP_PORT2_DOWN,
-    EL_SP_PORT2_LEFT,
-    EL_SP_PORT2_UP,
-    EL_SP_PORT_X,
-    EL_SP_PORT_Y,
-    EL_SP_PORT_XY,
+    EL_SP_PORT_RIGHT,
+    EL_SP_PORT_DOWN,
+    EL_SP_PORT_LEFT,
+    EL_SP_PORT_UP,
+    EL_SP_GRAVITY_PORT_RIGHT,
+    EL_SP_GRAVITY_PORT_DOWN,
+    EL_SP_GRAVITY_PORT_LEFT,
+    EL_SP_GRAVITY_PORT_UP,
+    EL_SP_PORT_HORIZONTAL,
+    EL_SP_PORT_VERTICAL,
+    EL_SP_PORT_ANY,
     EL_SP_DISK_RED,
     EL_SP_DISK_YELLOW,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
-    EL_SP_CHIP_UPPER,
-    EL_SP_CHIP_LOWER,
-    EL_SP_HARD_GRAY,
-    EL_SP_HARD_GREEN,
-    EL_SP_HARD_BLUE,
-    EL_SP_HARD_RED,
-    EL_SP_HARD_YELLOW,
-    EL_SP_HARD_BASE1,
-    EL_SP_HARD_BASE2,
-    EL_SP_HARD_BASE3,
-    EL_SP_HARD_BASE4,
-    EL_SP_HARD_BASE5,
-    EL_SP_HARD_BASE6,
-    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_SP_CHIP_TOP,
+    EL_SP_CHIP_BOTTOM,
+    EL_SP_HARDWARE_GRAY,
+    EL_SP_HARDWARE_GREEN,
+    EL_SP_HARDWARE_BLUE,
+    EL_SP_HARDWARE_RED,
+    EL_SP_HARDWARE_YELLOW,
+    EL_SP_HARDWARE_BASE_1,
+    EL_SP_HARDWARE_BASE_2,
+    EL_SP_HARDWARE_BASE_3,
+    EL_SP_HARDWARE_BASE_4,
+    EL_SP_HARDWARE_BASE_5,
+    EL_SP_HARDWARE_BASE_6,
+    EL_CONVEYOR_BELT_1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
     EL_SIGN_EXCLAMATION,
     EL_SIGN_RADIOACTIVITY,
     EL_SIGN_STOP,
@@ -2120,33 +1861,34 @@ void InitElementProperties()
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
     EL_STEELWALL_SLANTED,
-    EL_EMC_STEELWALL1,
-    EL_EMC_STEELWALL2,
-    EL_EMC_STEELWALL3,
-    EL_EMC_STEELWALL4,
-    EL_EMC_WALL_PILLAR_UPPER,
-    EL_EMC_WALL_PILLAR_MIDDLE,
-    EL_EMC_WALL_PILLAR_LOWER,
-    EL_EMC_WALL4,
-    EL_EMC_WALL5,
-    EL_EMC_WALL6,
-    EL_EMC_WALL7,
-    EL_EMC_WALL8
+    EL_EMC_STEELWALL_1,
+    EL_EMC_STEELWALL_2,
+    EL_EMC_STEELWALL_3,
+    EL_EMC_STEELWALL_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,
+    -1
   };
-  static int ep_inactive_num = SIZEOF_ARRAY_INT(ep_inactive);
 
   static int ep_explosive[] =
   {
     EL_BOMB,
     EL_DYNAMITE_ACTIVE,
     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_DYNABOMB_PLAYER_1_ACTIVE,
+    EL_DYNABOMB_PLAYER_2_ACTIVE,
+    EL_DYNABOMB_PLAYER_3_ACTIVE,
+    EL_DYNABOMB_PLAYER_4_ACTIVE,
+    EL_DYNABOMB_INCREASE_NUMBER,
+    EL_DYNABOMB_INCREASE_SIZE,
+    EL_DYNABOMB_INCREASE_POWER,
+    EL_SP_DISK_RED_ACTIVE,
     EL_BUG,
     EL_MOLE,
     EL_PENGUIN,
@@ -2158,11 +1900,11 @@ void InitElementProperties()
     EL_SP_DISK_YELLOW,
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
-    EL_DX_SUPABOMB
+    EL_DX_SUPABOMB,
+    -1
   };
-  static int ep_explosive_num = SIZEOF_ARRAY_INT(ep_explosive);
 
-  static int ep_mampf3[] =
+  static int ep_food_penguin[] =
   {
     EL_EMERALD,
     EL_BD_DIAMOND,
@@ -2171,9 +1913,9 @@ void InitElementProperties()
     EL_EMERALD_PURPLE,
     EL_DIAMOND,
     EL_PEARL,
-    EL_CRYSTAL
+    EL_CRYSTAL,
+    -1
   };
-  static int ep_mampf3_num = SIZEOF_ARRAY_INT(ep_mampf3);
 
   static int ep_pushable[] =
   {
@@ -2190,130 +1932,120 @@ void InitElementProperties()
     EL_SP_DISK_YELLOW,
     EL_BALLOON,
     EL_SPRING,
-    EL_DX_SUPABOMB
+    EL_DX_SUPABOMB,
+    -1
   };
-  static int ep_pushable_num = SIZEOF_ARRAY_INT(ep_pushable);
 
   static int ep_player[] =
   {
-    EL_PLAYER1,
-    EL_PLAYER2,
-    EL_PLAYER3,
-    EL_PLAYER4
+    EL_PLAYER_1,
+    EL_PLAYER_2,
+    EL_PLAYER_3,
+    EL_PLAYER_4,
+    -1
   };
-  static int ep_player_num = SIZEOF_ARRAY_INT(ep_player);
 
-  static int ep_has_content[] =
+  static int ep_walkable_over[] =
   {
-    EL_YAMYAM,
-    EL_AMOEBA_WET,
-    EL_AMOEBA_DRY,
-    EL_AMOEBA_FULL,
-    EL_BD_AMOEBA
+    EL_EMPTY_SPACE,
+    EL_SP_EMPTY_SPACE,
+    /* !!! EL_GATE_[1-4],    EL_GATE_[1-4]_GRAY    !!! */
+    /* !!! EL_EM_GATE_[1-4], EL_EM_GATE_[1-4]_GRAY !!! */
+    EL_SOKOBAN_FIELD_EMPTY,
+    EL_EXIT_OPEN,
+    EL_SP_EXIT_OPEN,
+    -1
   };
-  static int ep_has_content_num = SIZEOF_ARRAY_INT(ep_has_content);
 
-  static int ep_eatable[] =
+  static int ep_diggable[] =
   {
     EL_SAND,
     EL_SP_BASE,
     EL_SP_BUGGY_BASE,
+    EL_SP_BUGGY_BASE_ACTIVATING,
     EL_TRAP,
     EL_INVISIBLE_SAND,
-    EL_INVISIBLE_SAND_ACTIVE
+    EL_INVISIBLE_SAND_ACTIVE,
+#if 0
+    EL_LANDMINE,
+    EL_SP_BUGGY_BASE_ACTIVE,
+#endif
+    -1
   };
-  static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable);
 
-  static int ep_sp_element[] =
+  static int ep_collectible[] =
   {
-    EL_SP_EMPTY,
-    EL_SP_ZONK,
-    EL_SP_BASE,
-    EL_SP_MURPHY,
+    EL_BD_DIAMOND,
+    EL_EMERALD,
+    EL_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_KEY_1,
+    EL_KEY_2,
+    EL_KEY_3,
+    EL_KEY_4,
+    EL_EM_KEY_1,
+    EL_EM_KEY_2,
+    EL_EM_KEY_3,
+    EL_EM_KEY_4,
+    EL_DYNAMITE,
+    EL_DYNABOMB_INCREASE_NUMBER,
+    EL_DYNABOMB_INCREASE_SIZE,
+    EL_DYNABOMB_INCREASE_POWER,
     EL_SP_INFOTRON,
-    EL_SP_CHIP_SINGLE,
-    EL_SP_HARD_GRAY,
-    EL_SP_EXIT_CLOSED,
-    EL_SP_EXIT_OPEN,
-    EL_SP_DISK_ORANGE,
-    EL_SP_PORT1_RIGHT,
-    EL_SP_PORT1_DOWN,
-    EL_SP_PORT1_LEFT,
-    EL_SP_PORT1_UP,
-    EL_SP_PORT2_RIGHT,
-    EL_SP_PORT2_DOWN,
-    EL_SP_PORT2_LEFT,
-    EL_SP_PORT2_UP,
-    EL_SP_SNIKSNAK,
-    EL_SP_DISK_YELLOW,
-    EL_SP_TERMINAL,
     EL_SP_DISK_RED,
-    EL_SP_PORT_Y,
-    EL_SP_PORT_X,
-    EL_SP_PORT_XY,
-    EL_SP_ELECTRON,
-    EL_SP_BUGGY_BASE,
-    EL_SP_CHIP_LEFT,
-    EL_SP_CHIP_RIGHT,
-    EL_SP_HARD_BASE1,
-    EL_SP_HARD_GREEN,
-    EL_SP_HARD_BLUE,
-    EL_SP_HARD_RED,
-    EL_SP_HARD_YELLOW,
-    EL_SP_HARD_BASE2,
-    EL_SP_HARD_BASE3,
-    EL_SP_HARD_BASE4,
-    EL_SP_HARD_BASE5,
-    EL_SP_HARD_BASE6,
-    EL_SP_CHIP_UPPER,
-    EL_SP_CHIP_LOWER,
-    /* additional elements that appeared in newer Supaplex levels */
-    EL_INVISIBLE_WALL,
-    /* more than one murphy in a level results in an inactive clone */
-    EL_SP_MURPHY_CLONE
+    EL_PEARL,
+    EL_CRYSTAL,
+    EL_KEY_WHITE,
+    EL_SHIELD_NORMAL,
+    EL_SHIELD_DEADLY,
+    EL_EXTRA_TIME,
+    EL_ENVELOPE,
+    EL_SPEED_PILL,
+    -1
   };
-  static int ep_sp_element_num = SIZEOF_ARRAY_INT(ep_sp_element);
-
-  static int ep_quick_gate[] =
-  {
-    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,
-    EL_SP_PORT2_RIGHT,
-    EL_SP_PORT1_UP,
-    EL_SP_PORT2_UP,
-    EL_SP_PORT1_DOWN,
-    EL_SP_PORT2_DOWN,
-    EL_SP_PORT_X,
-    EL_SP_PORT_Y,
-    EL_SP_PORT_XY,
+
+  static int ep_walkable_through[] =
+  {
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
+    EL_SP_PORT_LEFT,
+    EL_SP_PORT_RIGHT,
+    EL_SP_PORT_UP,
+    EL_SP_PORT_DOWN,
+    EL_SP_PORT_HORIZONTAL,
+    EL_SP_PORT_VERTICAL,
+    EL_SP_PORT_ANY,
+    EL_SP_GRAVITY_PORT_LEFT,
+    EL_SP_GRAVITY_PORT_RIGHT,
+    EL_SP_GRAVITY_PORT_UP,
+    EL_SP_GRAVITY_PORT_DOWN,
     EL_SWITCHGATE_OPEN,
-    EL_TIMEGATE_OPEN
+    EL_TIMEGATE_OPEN,
+    -1
   };
-  static int ep_quick_gate_num = SIZEOF_ARRAY_INT(ep_quick_gate);
 
   static int ep_over_player[] =
   {
-    EL_SP_PORT1_LEFT,
-    EL_SP_PORT2_LEFT,
-    EL_SP_PORT1_RIGHT,
-    EL_SP_PORT2_RIGHT,
-    EL_SP_PORT1_UP,
-    EL_SP_PORT2_UP,
-    EL_SP_PORT1_DOWN,
-    EL_SP_PORT2_DOWN,
-    EL_SP_PORT_X,
-    EL_SP_PORT_Y,
-    EL_SP_PORT_XY,
-    EL_TUBE_ALL,
+    EL_SP_PORT_LEFT,
+    EL_SP_PORT_RIGHT,
+    EL_SP_PORT_UP,
+    EL_SP_PORT_DOWN,
+    EL_SP_GRAVITY_PORT_LEFT,
+    EL_SP_GRAVITY_PORT_RIGHT,
+    EL_SP_GRAVITY_PORT_UP,
+    EL_SP_GRAVITY_PORT_DOWN,
+    EL_SP_PORT_HORIZONTAL,
+    EL_SP_PORT_VERTICAL,
+    EL_SP_PORT_ANY,
+    EL_TUBE_ANY,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
     EL_TUBE_VERTICAL_LEFT,
@@ -2323,74 +2055,75 @@ void InitElementProperties()
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
-    EL_TUBE_RIGHT_DOWN
+    EL_TUBE_RIGHT_DOWN,
+    -1
   };
-  static int ep_over_player_num = SIZEOF_ARRAY_INT(ep_over_player);
 
   static int ep_active_bomb[] =
   {
     EL_DYNAMITE_ACTIVE,
-    EL_DYNABOMB_PLAYER1_ACTIVE,
-    EL_DYNABOMB_PLAYER2_ACTIVE,
-    EL_DYNABOMB_PLAYER3_ACTIVE,
-    EL_DYNABOMB_PLAYER4_ACTIVE
+    EL_DYNABOMB_PLAYER_1_ACTIVE,
+    EL_DYNABOMB_PLAYER_2_ACTIVE,
+    EL_DYNABOMB_PLAYER_3_ACTIVE,
+    EL_DYNABOMB_PLAYER_4_ACTIVE,
+    EL_SP_DISK_RED_ACTIVE,
+    -1
   };
-  static int ep_active_bomb_num = SIZEOF_ARRAY_INT(ep_active_bomb);
 
   static int ep_belt[] =
   {
-    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,
+    EL_CONVEYOR_BELT_1_LEFT,
+    EL_CONVEYOR_BELT_1_MIDDLE,
+    EL_CONVEYOR_BELT_1_RIGHT,
+    EL_CONVEYOR_BELT_2_LEFT,
+    EL_CONVEYOR_BELT_2_MIDDLE,
+    EL_CONVEYOR_BELT_2_RIGHT,
+    EL_CONVEYOR_BELT_3_LEFT,
+    EL_CONVEYOR_BELT_3_MIDDLE,
+    EL_CONVEYOR_BELT_3_RIGHT,
+    EL_CONVEYOR_BELT_4_LEFT,
+    EL_CONVEYOR_BELT_4_MIDDLE,
+    EL_CONVEYOR_BELT_4_RIGHT,
+    -1
   };
-  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,
+    EL_CONVEYOR_BELT_1_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT_1_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT_2_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT_2_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT_2_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT_3_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT_3_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT_3_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT_4_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT_4_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT_4_RIGHT_ACTIVE,
+    -1
   };
-  static int ep_belt_active_num = SIZEOF_ARRAY_INT(ep_belt_active);
 
   static int ep_belt_switch[] =
   {
-    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_CONVEYOR_BELT_1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
+    -1
   };
-  static int ep_belt_switch_num = SIZEOF_ARRAY_INT(ep_belt_switch);
 
-  static int ep_tube[] =
+  static int ep_walkable_under[] =
   {
-    EL_TUBE_ALL,
+    EL_TUBE_ANY,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
     EL_TUBE_VERTICAL_LEFT,
@@ -2400,156 +2133,225 @@ void InitElementProperties()
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
-    EL_TUBE_RIGHT_DOWN
+    EL_TUBE_RIGHT_DOWN,
+    -1
   };
-  static int ep_tube_num = SIZEOF_ARRAY_INT(ep_tube);
-
-  static long ep1_bit[] =
-  {
-    EP_BIT_AMOEBALIVE,
-    EP_BIT_AMOEBOID,
-    EP_BIT_SCHLUESSEL,
-    EP_BIT_PFORTE,
-    EP_BIT_SOLID,
-    EP_BIT_MASSIVE,
-    EP_BIT_SLIPPERY,
-    EP_BIT_ENEMY,
-    EP_BIT_MAUER,
-    EP_BIT_CAN_FALL,
-    EP_BIT_CAN_SMASH,
-    EP_BIT_CAN_CHANGE,
-    EP_BIT_CAN_MOVE,
-    EP_BIT_COULD_MOVE,
-    EP_BIT_DONT_TOUCH,
-    EP_BIT_DONT_GO_TO,
-    EP_BIT_MAMPF2,
-    EP_BIT_BD_ELEMENT,
-    EP_BIT_SB_ELEMENT,
-    EP_BIT_GEM,
-    EP_BIT_INACTIVE,
-    EP_BIT_EXPLOSIVE,
-    EP_BIT_MAMPF3,
-    EP_BIT_PUSHABLE,
-    EP_BIT_PLAYER,
-    EP_BIT_HAS_CONTENT,
-    EP_BIT_EATABLE,
-    EP_BIT_SP_ELEMENT,
-    EP_BIT_QUICK_GATE,
-    EP_BIT_OVER_PLAYER,
-    EP_BIT_ACTIVE_BOMB
+
+  static int ep_sp_element[] =
+  {
+    EL_SP_EMPTY,
+    EL_SP_ZONK,
+    EL_SP_BASE,
+    EL_SP_MURPHY,
+    EL_SP_INFOTRON,
+    EL_SP_CHIP_SINGLE,
+    EL_SP_HARDWARE_GRAY,
+    EL_SP_EXIT_CLOSED,
+    EL_SP_EXIT_OPEN,
+    EL_SP_DISK_ORANGE,
+    EL_SP_PORT_RIGHT,
+    EL_SP_PORT_DOWN,
+    EL_SP_PORT_LEFT,
+    EL_SP_PORT_UP,
+    EL_SP_GRAVITY_PORT_RIGHT,
+    EL_SP_GRAVITY_PORT_DOWN,
+    EL_SP_GRAVITY_PORT_LEFT,
+    EL_SP_GRAVITY_PORT_UP,
+    EL_SP_SNIKSNAK,
+    EL_SP_DISK_YELLOW,
+    EL_SP_TERMINAL,
+    EL_SP_DISK_RED,
+    EL_SP_PORT_VERTICAL,
+    EL_SP_PORT_HORIZONTAL,
+    EL_SP_PORT_ANY,
+    EL_SP_ELECTRON,
+    EL_SP_BUGGY_BASE,
+    EL_SP_CHIP_LEFT,
+    EL_SP_CHIP_RIGHT,
+    EL_SP_HARDWARE_BASE_1,
+    EL_SP_HARDWARE_GREEN,
+    EL_SP_HARDWARE_BLUE,
+    EL_SP_HARDWARE_RED,
+    EL_SP_HARDWARE_YELLOW,
+    EL_SP_HARDWARE_BASE_2,
+    EL_SP_HARDWARE_BASE_3,
+    EL_SP_HARDWARE_BASE_4,
+    EL_SP_HARDWARE_BASE_5,
+    EL_SP_HARDWARE_BASE_6,
+    EL_SP_CHIP_TOP,
+    EL_SP_CHIP_BOTTOM,
+    /* additional elements that appeared in newer Supaplex levels */
+    EL_INVISIBLE_WALL,
+    /* more than one murphy in a level results in an inactive clone */
+    EL_SP_MURPHY_CLONE,
+    -1
   };
-  static long ep2_bit[] =
+
+  static int ep_has_content[] =
   {
-    EP_BIT_BELT,
-    EP_BIT_BELT_ACTIVE,
-    EP_BIT_BELT_SWITCH,
-    EP_BIT_TUBE
+    EL_YAMYAM,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    -1
   };
-  static int *ep1_array[] =
-  {
-    ep_amoebalive,
-    ep_amoeboid,
-    ep_schluessel,
-    ep_pforte,
-    ep_solid,
-    ep_massive,
-    ep_slippery,
-    ep_enemy,
-    ep_mauer,
-    ep_can_fall,
-    ep_can_smash,
-    ep_can_change,
-    ep_can_move,
-    ep_could_move,
-    ep_dont_touch,
-    ep_dont_go_to,
-    ep_mampf2,
-    ep_bd_element,
-    ep_sb_element,
-    ep_gem,
-    ep_inactive,
-    ep_explosive,
-    ep_mampf3,
-    ep_pushable,
-    ep_player,
-    ep_has_content,
-    ep_eatable,
-    ep_sp_element,
-    ep_quick_gate,
-    ep_over_player,
-    ep_active_bomb
+
+  static int ep_solid_new[] =
+  {
+    -1
   };
-  static int *ep2_array[] =
+
+  static struct
   {
-    ep_belt,
-    ep_belt_active,
-    ep_belt_switch,
-    ep_tube
+    int *elements;
+    int property;
+  } element_properties[] =
+  {
+    { ep_amoebalive,		EP_AMOEBALIVE		},
+    { ep_amoeboid,		EP_AMOEBOID		},
+    { ep_can_be_crumbled,	EP_CAN_BE_CRUMBLED	},
+    { ep_pforte,		EP_PFORTE		},
+    { ep_solid,			EP_SOLID		},
+    { ep_indestructible,	EP_INDESTRUCTIBLE	},
+    { ep_slippery,		EP_SLIPPERY		},
+    { ep_enemy,			EP_ENEMY		},
+    { ep_mauer,			EP_MAUER		},
+    { ep_can_fall,		EP_CAN_FALL		},
+    { ep_can_smash,		EP_CAN_SMASH		},
+    { ep_can_change,		EP_CAN_CHANGE		},
+    { ep_can_move,		EP_CAN_MOVE		},
+    { ep_could_move,		EP_COULD_MOVE		},
+    { ep_dont_touch,		EP_DONT_TOUCH		},
+    { ep_dont_go_to,		EP_DONT_GO_TO		},
+    { ep_food_dark_yamyam,	EP_FOOD_DARK_YAMYAM	},
+    { ep_bd_element,		EP_BD_ELEMENT		},
+    { ep_sb_element,		EP_SB_ELEMENT		},
+    { ep_gem,			EP_GEM			},
+    { ep_inactive,		EP_INACTIVE		},
+    { ep_explosive,		EP_EXPLOSIVE		},
+    { ep_food_penguin,		EP_FOOD_PENGUIN		},
+    { ep_pushable,		EP_PUSHABLE		},
+    { ep_player,		EP_PLAYER		},
+    { ep_walkable_over,		EP_WALKABLE_OVER	},
+    { ep_diggable,		EP_DIGGABLE		},
+    { ep_collectible,		EP_COLLECTIBLE		},
+    { ep_walkable_through,	EP_WALKABLE_THROUGH	},
+    { ep_over_player,		EP_OVER_PLAYER		},
+    { ep_active_bomb,		EP_ACTIVE_BOMB		},
+    { ep_belt,			EP_BELT			},
+    { ep_belt_active,		EP_BELT_ACTIVE		},
+    { ep_belt_switch,		EP_BELT_SWITCH		},
+    { ep_walkable_under,	EP_WALKABLE_UNDER	},
+    { ep_sp_element,		EP_SP_ELEMENT		},
+    { ep_has_content,		EP_HAS_CONTENT		},
+    { ep_solid_new,		EP_SOLID_NEW		},
+    { NULL,			-1			}
   };
-  static int *ep1_num[] =
-  {
-    &ep_amoebalive_num,
-    &ep_amoeboid_num,
-    &ep_schluessel_num,
-    &ep_pforte_num,
-    &ep_solid_num,
-    &ep_massive_num,
-    &ep_slippery_num,
-    &ep_enemy_num,
-    &ep_mauer_num,
-    &ep_can_fall_num,
-    &ep_can_smash_num,
-    &ep_can_change_num,
-    &ep_can_move_num,
-    &ep_could_move_num,
-    &ep_dont_touch_num,
-    &ep_dont_go_to_num,
-    &ep_mampf2_num,
-    &ep_bd_element_num,
-    &ep_sb_element_num,
-    &ep_gem_num,
-    &ep_inactive_num,
-    &ep_explosive_num,
-    &ep_mampf3_num,
-    &ep_pushable_num,
-    &ep_player_num,
-    &ep_has_content_num,
-    &ep_eatable_num,
-    &ep_sp_element_num,
-    &ep_quick_gate_num,
-    &ep_over_player_num,
-    &ep_active_bomb_num
+
+#if 0
+  static int active_properties[] =
+  {
+    EP_AMOEBALIVE,
+    EP_AMOEBOID,
+    EP_PFORTE,
+    EP_SOLID,
+    EP_ENEMY,
+    EP_MAUER,
+    EP_CAN_FALL,
+    EP_CAN_SMASH,
+    EP_CAN_CHANGE,
+    EP_CAN_MOVE,
+    EP_COULD_MOVE,
+    EP_DONT_TOUCH,
+    EP_DONT_GO_TO,
+    EP_GEM,
+    EP_EXPLOSIVE,
+    EP_PUSHABLE,
+    EP_PLAYER,
+    EP_HAS_CONTENT,
+    EP_DIGGABLE,
+    EP_WALKABLE_THROUGH,
+    EP_OVER_PLAYER,
+    EP_ACTIVE_BOMB,
+
+    EP_BELT,
+    EP_BELT_ACTIVE,
+    EP_BELT_SWITCH,
+    EP_WALKABLE_UNDER,
+    EP_EM_SLIPPERY_WALL,
+    EP_CAN_BE_CRUMBLED,
   };
-  static int *ep2_num[] =
+#endif
+
+  /* always start with reliable default values (no properties) */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+    for (j=0; j<NUM_EP_BITFIELDS; j++)
+      Properties[i][j] = EP_BITMASK_DEFAULT;
+
+  /* set all predefined element properties from above arrays */
+  for (i=0; element_properties[i].elements != NULL; i++)
+    for (j=0; (element_properties[i].elements)[j] != -1; j++)
+      SET_PROPERTY((element_properties[i].elements)[j],
+		   element_properties[i].property, TRUE);
+
+  /* set properties of character elements */
+  for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
+    SET_PROPERTY(i, EP_INACTIVE, TRUE);
+
+#if 0
+  /* determine inactive elements (used for engine main loop optimization) */
+  for (i=0; i < MAX_NUM_ELEMENTS; i++)
   {
-    &ep_belt_num,
-    &ep_belt_active_num,
-    &ep_belt_switch_num,
-    &ep_tube_num
-  };
-  static int num_properties1 = SIZEOF_ARRAY(ep1_num, int *);
-  static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *);
+    boolean active = FALSE;
+
+    for (j=0; i < NUM_ELEMENT_PROPERTIES; j++)
+    {
+      if (HAS_PROPERTY(i, j))
+	active = TRUE;
+    }
+
+#if 0
+    if (!active)
+      SET_PROPERTY(i, EP_INACTIVE, TRUE);
+#endif
+  }
+#endif
 
-  for (i=0; i<MAX_ELEMENTS; i++)
+#if 0
+  for (i=0; i < MAX_NUM_ELEMENTS; i++)
   {
-    Elementeigenschaften1[i] = 0;
-    Elementeigenschaften2[i] = 0;
+    boolean element_is_solid = TRUE;
+
+    if (IS_DIGGABLE(i) ||
+	IS_COLLECTIBLE(i) ||
+	CAN_FALL(i) ||
+	CAN_MOVE(i) ||
+	IS_PUSHABLE(i))
+      element_is_solid = FALSE;
+
+    if (IS_INDESTRUCTIBLE(i))
+      element_is_solid = TRUE;
+
+    if (element_is_solid != HAS_PROPERTY(i, EP_SOLID))
+      printf("::: '%s' should %s solid\n", element_info[i].token_name,
+	     (HAS_PROPERTY(i, EP_SOLID) ? "NOT be" : "be"));
   }
+#endif
+}
 
-  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];
+static void InitGlobal()
+{
+  global.autoplay_leveldir = NULL;
 
-  for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
-    Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
+  global.frames_per_second = 0;
+  global.fps_slowdown = FALSE;
+  global.fps_slowdown_factor = 1;
 }
 
-void Execute_Debug_Command(char *command)
+void Execute_Command(char *command)
 {
-  if (strcmp(command, "create graphicsinfo.conf") == 0)
+  if (strcmp(command, "print graphicsinfo.conf") == 0)
   {
     int i;
 
@@ -2565,8 +2367,10 @@ void Execute_Debug_Command(char *command)
       printf("# %s\n",
 	     getFormattedSetupEntry(image_config[i].token,
 				    image_config[i].value));
-  }
-  else if (strcmp(command, "create soundsinfo.conf") == 0)
+
+    exit(0);
+  }
+  else if (strcmp(command, "print soundsinfo.conf") == 0)
   {
     int i;
 
@@ -2582,45 +2386,529 @@ void Execute_Debug_Command(char *command)
       printf("# %s\n",
 	     getFormattedSetupEntry(sound_config[i].token,
 				    sound_config[i].value));
+
+    exit(0);
   }
-  else if (strcmp(command, "create musicinfo.conf") == 0)
+  else if (strcmp(command, "print musicinfo.conf") == 0)
   {
     printf("# (Currently only \"name\" and \"sort_priority\" recognized.)\n");
     printf("\n");
     printf("%s\n", getFormattedSetupEntry("name", "Classic Music"));
     printf("\n");
     printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+
+    exit(0);
+  }
+  else if (strncmp(command, "dump level ", 11) == 0)
+  {
+    char *filename = &command[11];
+
+    if (access(filename, F_OK) != 0)
+      Error(ERR_EXIT, "cannot open file '%s'", filename);
+
+    LoadLevelFromFilename(filename);
+    DumpLevel(&level);
+
+    exit(0);
+  }
+  else if (strncmp(command, "dump tape ", 10) == 0)
+  {
+    char *filename = &command[10];
+
+    if (access(filename, F_OK) != 0)
+      Error(ERR_EXIT, "cannot open file '%s'", filename);
+
+    LoadTapeFromFilename(filename);
+    DumpTape(&tape);
+
+    exit(0);
+  }
+  else if (strncmp(command, "autoplay ", 9) == 0)
+  {
+    char *str_copy = getStringCopy(&command[9]);
+    char *str_ptr = strchr(str_copy, ' ');
+
+    global.autoplay_leveldir = str_copy;
+    global.autoplay_level_nr = -1;
+
+    if (str_ptr != NULL)
+    {
+      *str_ptr++ = '\0';			/* terminate leveldir string */
+      global.autoplay_level_nr = atoi(str_ptr);	/* get level_nr value */
+    }
   }
-  else if (strcmp(command, "help") == 0)
+  else
   {
-    printf("The following commands are recognized:\n");
-    printf("   \"create graphicsinfo.conf\"\n");
-    printf("   \"create soundsinfo.conf\"\n");
-    printf("   \"create musicinfo.conf\"\n");
+    Error(ERR_EXIT_HELP, "unrecognized command '%s'", command);
   }
 }
 
-void CloseAllAndExit(int exit_value)
+static void InitSetup()
 {
-#if 0
+  LoadSetup();					/* global setup info */
+
+  /* set some options from setup file */
+
+  if (setup.options.verbose)
+    options.verbose = TRUE;
+}
+
+static void InitPlayerInfo()
+{
+  int i;
+
+  /* choose default local player */
+  local_player = &stored_player[0];
+
+  for (i=0; i<MAX_PLAYERS; i++)
+    stored_player[i].connected = FALSE;
+
+  local_player->connected = TRUE;
+}
+
+static void InitArtworkInfo()
+{
+  LoadArtworkInfo();
+}
+
+static char *get_element_class_token(int element)
+{
+  char *element_class_name = element_info[element].class_name;
+  char *element_class_token = checked_malloc(strlen(element_class_name) + 3);
+
+  sprintf(element_class_token, "[%s]", element_class_name);
+
+  return element_class_token;
+}
+
+static void InitArtworkConfig()
+{
+  static char *image_id_prefix[MAX_NUM_ELEMENTS + NUM_FONTS + 1];
+  static char *sound_id_prefix[MAX_NUM_ELEMENTS + 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",
+    "global.num_toons",
+    "menu.draw_xoffset",
+    "menu.draw_yoffset",
+    "menu.draw_xoffset.MAIN",
+    "menu.draw_yoffset.MAIN",
+    "door.step_offset",
+    "door.step_delay",
+    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; i++)
+    image_id_prefix[MAX_NUM_ELEMENTS + i] = font_info[i].token_name;
+  image_id_prefix[MAX_NUM_ELEMENTS + NUM_FONTS] = NULL;
+
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+    sound_id_prefix[i] = element_info[i].token_name;
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+    sound_id_prefix[MAX_NUM_ELEMENTS + i] = get_element_class_token(i);
+  sound_id_prefix[MAX_NUM_ELEMENTS + MAX_NUM_ELEMENTS] = NULL;
+
+  for (i=0; i<NUM_ACTIONS; i++)
+    action_id_suffix[i] = element_action_info[i].suffix;
+  action_id_suffix[NUM_ACTIONS] = NULL;
+
+  for (i=0; i<NUM_DIRECTIONS; i++)
+    direction_id_suffix[i] = element_direction_info[i].suffix;
+  direction_id_suffix[NUM_DIRECTIONS] = NULL;
+
+  for (i=0; i<NUM_SPECIAL_GFX_ARGS; i++)
+    special_id_suffix[i] = special_suffix_info[i].suffix;
+  special_id_suffix[NUM_SPECIAL_GFX_ARGS] = NULL;
+
+  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,
+		special_id_suffix, ignore_sound_tokens);
+}
+
+static void InitMixer()
+{
+  OpenAudio();
+  StartMixer();
+}
+
+void InitGfx()
+{
+  char *filename_font_initial = NULL;
+  Bitmap *bitmap_font_initial = NULL;
+  int i, j;
+
+  /* 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++)
+    {
+      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);
+      }
+    }
+  }
+
+  for (j=0; j < NUM_INITIAL_FONTS; j++)
+  {
+    font_initial[j].num_chars = DEFAULT_NUM_CHARS_PER_FONT;
+    font_initial[j].num_chars_per_line = DEFAULT_NUM_CHARS_PER_LINE;
+  }
+
+  if (filename_font_initial == NULL)	/* should not happen */
+    Error(ERR_EXIT, "cannot get filename for '%s'", CONFIG_TOKEN_FONT_INITIAL);
+
+  /* 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);
+
+  /* initialize screen properties */
+  InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE,
+		   REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
+		   bitmap_db_field);
+  InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE);
+  InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE);
+  InitGfxScrollbufferInfo(FXSIZE, FYSIZE);
+
+  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 InitGfxBackground()
+{
+  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;
+}
+
+static void InitLevelInfo()
+{
+  LoadLevelInfo();				/* global level info */
+  LoadLevelSetup_LastSeries();			/* last played series info */
+  LoadLevelSetup_SeriesInfo();			/* last played level info */
+}
+
+void InitLevelArtworkInfo()
+{
+  LoadLevelArtworkInfo();
+}
+
+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();
+}
+
+void InitNetworkServer()
+{
+#if defined(PLATFORM_UNIX)
+  int nr_wanted;
+#endif
+
+  if (!options.network)
+    return;
+
+#if defined(PLATFORM_UNIX)
+  nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
+
+  if (!ConnectToServer(options.server_host, options.server_port))
+    Error(ERR_EXIT, "cannot connect to network game server");
+
+  SendToServer_PlayerName(setup.player_name);
+  SendToServer_ProtocolVersion();
+
+  if (nr_wanted)
+    SendToServer_NrWanted(nr_wanted);
+#endif
+}
+
+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;
+
+  /* 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;
+  }
+
+  /* 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)
+  {
+#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 (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 (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 ||
+      last_override_level_music != setup.override_level_music)
+  {
+    /* set artwork path to send it to the sound server process */
+    setLevelArtworkDir(artwork.mus_first);
+
+    InitReloadCustomMusic(mus_new_identifier);
+    ReinitializeMusic();
+
+    artwork.mus_current_identifier = artwork.mus_current->identifier;
+    last_override_level_music = setup.override_level_music;
+
+    redraw_screen = TRUE;
+  }
+
+  if (redraw_screen)
+  {
+    InitGfxBackground();
+
+    /* force redraw of (open or closed) door graphics */
+    SetDoorState(DOOR_OPEN_ALL);
+    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
+  }
+}
+
+
+/* ========================================================================= */
+/* OpenAll()                                                                 */
+/* ========================================================================= */
+
+void OpenAll()
+{
+  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 only supported in Unix version");
 #endif
+    exit(0);	/* never reached */
+  }
+
+  InitSetup();
 
+  InitPlayerInfo();
+  InitArtworkInfo();		/* needed before loading gfx, sound & music */
+  InitArtworkConfig();		/* needed before forking sound child process */
+  InitMixer();
+
+  InitCounter();
+
+  InitRND(NEW_RANDOMIZE);
+  InitSimpleRND(NEW_RANDOMIZE);
+
+  InitJoysticks();
+
+  InitVideoDisplay();
+  InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH,
+		  setup.fullscreen);
+
+  InitEventFilter(FilterMouseMotionEvents);
+
+  InitElementProperties();
+
+  InitGfx();
+
+  InitLevelInfo();
+  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 CloseAllAndExit(int exit_value)
+{
   StopSounds();
   FreeAllSounds();
   FreeAllMusic();
   CloseAudio();		/* called after freeing sounds (needed for SDL) */
 
   FreeAllImages();
-
   FreeTileClipmasks();
-#if 0
-  for (i=0; i<NUM_BITMAPS; i++)
-    FreeBitmap(pix[i]);
-#endif
-
-  if (bitmap_font_initial)
-    FreeBitmap(bitmap_font_initial);
 
   CloseVideoDisplay();
   ClosePlatformDependantStuff();