rnd-20030416-1-src
[rocksndiamonds.git] / src / init.c
index 60f6febb1d948eb5f7b8e2b1955ece08dfeac1e0..508a50af5580138576d56812052d4f5029ec8e14 100644 (file)
 #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 Bitmap *bitmap_font_initial = NULL;
-
-static void InitGlobal();
-static void InitSetup();
-static void InitPlayerInfo();
-static void InitLevelInfo();
-static void InitArtworkInfo();
-static void InitLevelArtworkInfo();
-static void InitNetworkServer();
-static void InitArtworkConfig();
-static void InitImages();
-static void InitMixer();
-static void InitSound();
-static void InitMusic();
-static void InitGfx();
-static void InitGfxBackground();
-static void InitGadgets();
-static void InitElementSmallImages();
-static void InitElementGraphicInfo();
-static void InitElementSpecialGraphicInfo();
-static void InitElementSoundInfo();
-static void InitElementProperties();
-static void InitGraphicInfo();
-static void InitSoundInfo();
-static void Execute_Command(char *);
+#define CONFIG_TOKEN_FONT_INITIAL              "font.initial"
 
-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 */
-  }
-
-  InitProgramInfo(UNIX_USERDATA_DIRECTORY,
-                 PROGRAM_TITLE_STRING, getWindowTitleString(),
-                 ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME,
-                 MSDOS_POINTER_FILENAME,
-                 COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
-
-  InitSetup();
-  InitPlayerInfo();
-  InitArtworkInfo();           /* needed before loading gfx, sound & music */
-  InitArtworkConfig();         /* needed before forking sound child process */
-  InitMixer();
-
-  InitCounter();
-
-  InitJoysticks();
-  InitRND(NEW_RANDOMIZE);
-
-  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;
-  }
-
-  DrawMainMenu();
-
-  InitNetworkServer();
-}
-
-static void InitGlobal()
-{
-  global.autoplay_leveldir = NULL;
-
-  global.frames_per_second = 0;
-  global.fps_slowdown = FALSE;
-  global.fps_slowdown_factor = 1;
-}
-
-static void InitSetup()
-{
-  LoadSetup();                                 /* global setup info */
-}
-
-static void InitPlayerInfo()
-{
-  int i;
-
-  /* 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 InitLevelInfo()
-{
-  LoadLevelInfo();                             /* global level info */
-  LoadLevelSetup_LastSeries();                 /* last played series info */
-  LoadLevelSetup_SeriesInfo();                 /* last played level info */
-}
-
-static void InitArtworkInfo()
-{
-  LoadArtworkInfo();
-}
-
-static void InitArtworkConfig()
-{
-  static char *element_prefix[MAX_NUM_ELEMENTS + 1];
-  static char *sound_class_prefix[MAX_NUM_ELEMENTS + 1];
-  static char *action_suffix[NUM_ACTIONS + 1];
-  static char *direction_suffix[NUM_DIRECTIONS + 1];
-  static char *special_suffix[NUM_SPECIAL_GFX_ARGS + 1];
-  static char *dummy[1] = { NULL };
-  int i;
-
-  for (i=0; i<MAX_NUM_ELEMENTS + 1; i++)
-    element_prefix[i] = element_info[i].token_name;
-  for (i=0; i<MAX_NUM_ELEMENTS + 1; i++)
-    sound_class_prefix[i] = element_info[i].sound_class_name;
-  for (i=0; i<NUM_ACTIONS + 1; i++)
-    action_suffix[i] = element_action_info[i].suffix;
-  for (i=0; i<NUM_DIRECTIONS + 1; i++)
-    direction_suffix[i] = element_direction_info[i].suffix;
-  for (i=0; i<NUM_SPECIAL_GFX_ARGS + 1; i++)
-    special_suffix[i] = special_suffix_info[i].suffix;
-
-  InitImageList(image_config, NUM_IMAGE_FILES, image_config_suffix,
-               element_prefix, action_suffix,direction_suffix,special_suffix);
-  InitSoundList(sound_config, NUM_SOUND_FILES, sound_config_suffix,
-               sound_class_prefix, action_suffix, dummy, dummy);
-}
-
-void InitLevelArtworkInfo()
-{
-  LoadLevelArtworkInfo();
-}
-
-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 InitMixer()
-{
-  OpenAudio();
-  StartMixer();
-}
-
-static void ReinitializeGraphics()
-{
-  InitElementGraphicInfo();            /* element game graphic mapping */
-  InitElementSpecialGraphicInfo();     /* element special graphic mapping */
-  InitGraphicInfo();                   /* graphic properties mapping */
-
-  InitElementSmallImages();            /* create editor and preview images */
-
-  InitFontInfo(bitmap_font_initial,
-              graphic_info[IMG_FONT_BIG].bitmap,
-              graphic_info[IMG_FONT_MEDIUM].bitmap,
-              graphic_info[IMG_FONT_SMALL].bitmap,
-              graphic_info[IMG_FONT_EM].bitmap);
-
-  SetMainBackgroundImage(IMG_BACKGROUND_DEFAULT);
-  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
-
-  InitGadgets();
-  InitToons();
-}
-
-static void ReinitializeSounds()
-{
-  InitElementSoundInfo();      /* element game sound mapping */
-  InitSoundInfo();             /* sound properties mapping */
-
-  InitPlaySoundLevel();                /* internal game sound settings */
-}
-
-static void ReinitializeMusic()
-{
-  /* currently nothing to do */
-}
-
-static void InitImages()
-{
-  ReloadCustomImages();
-  ReinitializeGraphics();
-
-  LoadCustomElementDescriptions();
-  LoadSpecialMenuDesignSettings();
-}
 
-static void InitSound()
-{
-  InitReloadCustomSounds(artwork.snd_current->identifier);
-  ReinitializeSounds();
-}
+struct FontBitmapInfo font_initial[NUM_INITIAL_FONTS];
 
-static void InitMusic()
-{
-  InitReloadCustomMusic(artwork.mus_current->identifier);
-  ReinitializeMusic();
-}
 
 static void InitTileClipmasks()
 {
@@ -449,246 +211,202 @@ void FreeTileClipmasks()
 #endif
 }
 
-void InitGfx()
+void FreeGadgets()
 {
-  char *config_token_font_initial = "font.small";
-  char *filename_font_initial = NULL;
-  int i;
+  FreeLevelEditorGadgets();
+  FreeGameButtons();
+  FreeTapeButtons();
+  FreeToolButtons();
+  FreeScreenGadgets();
+}
 
-  /* determine filename for initial font (for displaying startup messages) */
-  for (i=0; image_config[i].token != NULL; i++)
-    if (strcmp(image_config[i].token, config_token_font_initial) == 0)
-      filename_font_initial = image_config[i].value;
+void InitGadgets()
+{
+  static boolean gadgets_initialized = FALSE;
 
-  if (filename_font_initial == NULL)   /* should not happen */
-    Error(ERR_EXIT, "cannot get filename for '%s'", config_token_font_initial);
+  if (gadgets_initialized)
+    FreeGadgets();
 
-  /* 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);
+  CreateLevelEditorGadgets();
+  CreateGameButtons();
+  CreateTapeButtons();
+  CreateToolButtons();
+  CreateScreenGadgets();
 
-  /* 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);
+  gadgets_initialized = TRUE;
+}
 
-  bitmap_font_initial = LoadCustomImage(filename_font_initial);
+void InitElementSmallImages()
+{
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
+  int i;
 
-  InitFontInfo(bitmap_font_initial, NULL, NULL, NULL, NULL);
+  /* initialize normal images from static configuration */
+  for (i=0; element_to_graphic[i].element > -1; i++)
+    CreateImageWithSmallImages(element_to_graphic[i].graphic);
 
-  DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
-  DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
+  /* initialize special images from static configuration */
+  for (i=0; element_to_special_graphic[i].element > -1; i++)
+    CreateImageWithSmallImages(element_to_special_graphic[i].graphic);
 
-  DrawInitText("Loading graphics:", 120, FC_GREEN);
+  /* 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);
+}
 
-  InitTileClipmasks();
+static int getFontBitmapID(int font_nr)
+{
+  int special = -1;
+
+  if (game_status == MAINMENU || game_status == TYPENAME)
+    special = GFX_SPECIAL_ARG_MAIN;
+  else if (game_status == CHOOSELEVEL)
+    special = GFX_SPECIAL_ARG_LEVELS;
+  else if (game_status == HALLOFFAME)
+    special = GFX_SPECIAL_ARG_SCORES;
+  else if (game_status == LEVELED)
+    special = GFX_SPECIAL_ARG_EDITOR;
+  else if (game_status == HELPSCREEN)
+    special = GFX_SPECIAL_ARG_INFO;
+  else if (game_status == SETUP)
+    special = GFX_SPECIAL_ARG_SETUP;
+  else if (game_status == PSEUDO_PREVIEW)
+    special = GFX_SPECIAL_ARG_PREVIEW;
+  else if (game_status == PLAYING || game_status == PSEUDO_DOOR)
+    special = GFX_SPECIAL_ARG_DOOR;
+
+  if (special != -1)
+    return font_info[font_nr].special_bitmap_id[special];
+  else
+    return font_nr;
 }
 
-void InitGfxBackground()
+void InitFontGraphicInfo()
 {
-  int x, y;
+  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;
 
-  drawto = backbuffer;
-  fieldbuffer = bitmap_db_field;
-  SetDrawtoField(DRAW_BACKBUFFER);
+  if (graphic_info == NULL)            /* still at startup phase */
+  {
+    InitFontInfo(font_initial, NUM_INITIAL_FONTS, getFontBitmapID);
 
-  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);
+    return;
+  }
 
-  for (x=0; x<MAX_BUF_XSIZE; x++)
-    for (y=0; y<MAX_BUF_YSIZE; y++)
-      redraw[x][y] = 0;
-  redraw_tiles = 0;
-  redraw_mask = REDRAW_ALL;
-}
-
-void ReloadCustomArtwork()
-{
-  static char *leveldir_current_identifier = NULL;
-  static boolean last_override_level_graphics = FALSE;
-  static boolean last_override_level_sounds = FALSE;
-  static boolean last_override_level_music = FALSE;
-  /* identifier for new artwork; default: artwork configured in setup */
-  char *gfx_new_identifier = artwork.gfx_current->identifier;
-  char *snd_new_identifier = artwork.snd_current->identifier;
-  char *mus_new_identifier = artwork.mus_current->identifier;
-  boolean redraw_screen = FALSE;
-
-  if (leveldir_current_identifier == NULL)
-    leveldir_current_identifier = leveldir_current->identifier;
-
-#if 0
-  printf("CURRENT GFX: '%s' ['%s']\n", artwork.gfx_current->identifier,
-        leveldir_current->graphics_set);
-  printf("CURRENT LEV: '%s' / '%s'\n", leveldir_current_identifier,
-        leveldir_current->identifier);
-#endif
-
-#if 0
-  printf("graphics --> '%s' ('%s')\n",
-        artwork.gfx_current_identifier, artwork.gfx_current->filename);
-  printf("sounds   --> '%s' ('%s')\n",
-        artwork.snd_current_identifier, artwork.snd_current->filename);
-  printf("music    --> '%s' ('%s')\n",
-        artwork.mus_current_identifier, artwork.mus_current->filename);
-#endif
+  /* ---------- initialize font graphic definitions ---------- */
 
-  /* leveldir_current may be invalid (level group, parent link) */
-  if (!validLevelSeries(leveldir_current))
-    return;
+  /* always start with reliable default values (normal font graphics) */
+  for (i=0; i < NUM_FONTS; i++)
+    font_info[i].graphic = FONT_INITIAL_1;
 
-  /* 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)
+  /* initialize normal font/graphic mapping from static configuration */
+  for (i=0; font_to_graphic[i].font_nr > -1; i++)
   {
-    char *identifier_old = leveldir_current_identifier;
-    char *identifier_new = leveldir_current->identifier;
+    int font_nr = font_to_graphic[i].font_nr;
+    int special = font_to_graphic[i].special;
+    int graphic = font_to_graphic[i].graphic;
 
-    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;
+    if (special != -1)
+      continue;
 
-    leveldir_current_identifier = leveldir_current->identifier;
+    font_info[font_nr].graphic = graphic;
   }
 
-  /* 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)
+  /* always start with reliable default values (special font graphics) */
+  for (i=0; i < NUM_FONTS; i++)
   {
-#if 0
-    printf("RELOADING GRAPHICS '%s' -> '%s' ('%s')\n",
-          artwork.gfx_current_identifier,
-          artwork.gfx_current->identifier,
-          gfx_new_identifier);
-#endif
-
-    setLevelArtworkDir(artwork.gfx_first);
-
-    ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
-
-    ReloadCustomImages();
-    ReinitializeGraphics();
-
-    LoadCustomElementDescriptions();
-    LoadSpecialMenuDesignSettings();
-
-    FreeTileClipmasks();
-    InitTileClipmasks();
-
-    artwork.gfx_current_identifier = artwork.gfx_current->identifier;
-    last_override_level_graphics = setup.override_level_graphics;
-
-    redraw_screen = TRUE;
+    for (j=0; j < NUM_SPECIAL_GFX_ARGS; j++)
+    {
+      font_info[i].special_graphic[j] = font_info[i].graphic;
+      font_info[i].special_bitmap_id[j] = i;
+    }
   }
 
-  if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 ||
-      last_override_level_sounds != setup.override_level_sounds)
+  /* initialize special font/graphic mapping from static configuration */
+  for (i=0; font_to_graphic[i].font_nr > -1; i++)
   {
-#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;
+    int font_nr = font_to_graphic[i].font_nr;
+    int special = font_to_graphic[i].special;
+    int graphic = font_to_graphic[i].graphic;
 
-    redraw_screen = TRUE;
+    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++;
+    }
   }
 
-  if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 ||
-      last_override_level_music != setup.override_level_music)
+  /* initialize special element/graphic mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
   {
-    /* 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;
-  }
+    int font_nr = property_mapping[i].base_index - MAX_NUM_ELEMENTS;
+    int special = property_mapping[i].ext3_index;
+    int graphic = property_mapping[i].artwork_index;
 
-  if (redraw_screen)
-  {
-    InitGfxBackground();
+    if (font_nr < 0)
+      continue;
 
-    /* force redraw of (open or closed) door graphics */
-    SetDoorState(DOOR_OPEN_ALL);
-    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
+    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++;
+    }
   }
-}
 
-void FreeGadgets()
-{
-  FreeLevelEditorGadgets();
-  FreeGameButtons();
-  FreeTapeButtons();
-  FreeToolButtons();
-  FreeScreenGadgets();
-}
+  /* ---------- initialize font bitmap array ---------- */
 
-void InitGadgets()
-{
-  static boolean gadgets_initialized = FALSE;
+  if (font_bitmap_info != NULL)
+    free(font_bitmap_info);
 
-  if (gadgets_initialized)
-    FreeGadgets();
+  font_bitmap_info =
+    checked_calloc(num_font_bitmaps * sizeof(struct FontBitmapInfo));
 
-  CreateLevelEditorGadgets();
-  CreateGameButtons();
-  CreateTapeButtons();
-  CreateToolButtons();
-  CreateScreenGadgets();
+  /* ---------- initialize font bitmap definitions ---------- */
 
-  gadgets_initialized = TRUE;
-}
+  for (i=0; i < NUM_FONTS; i++)
+  {
+    if (i < NUM_INITIAL_FONTS)
+    {
+      font_bitmap_info[i] = font_initial[i];
+      continue;
+    }
 
-void InitElementSmallImages()
-{
-  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
-  int num_property_mappings = getImageListPropertyMappingSize();
-  int i;
+    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];
 
-  /* initialize normal images from static configuration */
-  for (i=0; element_to_graphic[i].element > -1; i++)
-    CreateImageWithSmallImages(element_to_graphic[i].graphic);
+      /* 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;
+      }
 
-  /* initialize special images from static configuration */
-  for (i=0; element_to_special_graphic[i].element > -1; i++)
-    CreateImageWithSmallImages(element_to_special_graphic[i].graphic);
+      /* 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;
+    }
+  }
 
-  /* initialize images from dynamic configuration */
-  for (i=0; i < num_property_mappings; i++)
-    CreateImageWithSmallImages(property_mapping[i].artwork_index);
+  InitFontInfo(font_bitmap_info, num_font_bitmaps, getFontBitmapID);
 }
 
 void InitElementGraphicInfo()
@@ -709,16 +427,6 @@ void InitElementGraphicInfo()
     }
   }
 
-#if 0
-  for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
-    element_info[i].graphic[ACTION_DEFAULT] =
-      IMG_CHAR_START + (i - EL_CHAR_START);
-
-  for (i=EL_CUSTOM_START; i<=EL_CUSTOM_END; i++)
-    element_info[i].graphic[ACTION_DEFAULT] =
-      IMG_CUSTOM_START + (i - EL_CUSTOM_START);
-#endif
-
   /* initialize normal element/graphic mapping from static configuration */
   for (i=0; element_to_graphic[i].element > -1; i++)
   {
@@ -727,6 +435,9 @@ void InitElementGraphicInfo()
     int direction = element_to_graphic[i].direction;
     int graphic   = element_to_graphic[i].graphic;
 
+    if (graphic_info[graphic].bitmap == NULL)
+      continue;
+
     if (action < 0)
       action = ACTION_DEFAULT;
 
@@ -745,7 +456,10 @@ void InitElementGraphicInfo()
     int special   = property_mapping[i].ext3_index;
     int graphic   = property_mapping[i].artwork_index;
 
-    if (special != -1)
+    if (graphic_info[graphic].bitmap == NULL)
+      continue;
+
+    if (element >= MAX_NUM_ELEMENTS || special != -1)
       continue;
 
     if (action < 0)
@@ -777,13 +491,18 @@ void InitElementGraphicInfo()
 
     for (act=0; act<NUM_ACTIONS; act++)
     {
+      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] =
@@ -792,11 +511,12 @@ void InitElementGraphicInfo()
 
       /* 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 1
+#if 0
 #if DEBUG
   if (options.verbose)
   {
@@ -814,14 +534,13 @@ void InitElementSpecialGraphicInfo()
 {
   struct PropertyMapping *property_mapping = getImageListPropertyMapping();
   int num_property_mappings = getImageListPropertyMappingSize();
-  int i;
+  int i, j;
 
   /* always start with reliable default values */
-  for (i=0; i<MAX_NUM_ELEMENTS; i++)
-  {
-    element_info[i].editor_graphic = element_info[i].graphic[ACTION_DEFAULT];
-    element_info[i].preview_graphic = element_info[i].graphic[ACTION_DEFAULT];
-  }
+  for (i=0; i < MAX_NUM_ELEMENTS; i++)
+    for (j=0; j < NUM_SPECIAL_GFX_ARGS; j++)
+      element_info[i].special_graphic[j] =
+       element_info[i].graphic[ACTION_DEFAULT];
 
   /* initialize special element/graphic mapping from static configuration */
   for (i=0; element_to_special_graphic[i].element > -1; i++)
@@ -835,10 +554,7 @@ void InitElementSpecialGraphicInfo()
     if (base_redefined && !special_redefined)
       continue;
 
-    if (special == GFX_SPECIAL_ARG_EDITOR)
-      element_info[element].editor_graphic = graphic;
-    else if (special == GFX_SPECIAL_ARG_PREVIEW)
-      element_info[element].preview_graphic = graphic;
+    element_info[element].special_graphic[special] = graphic;
   }
 
   /* initialize special element/graphic mapping from dynamic configuration */
@@ -848,30 +564,27 @@ void InitElementSpecialGraphicInfo()
     int special = property_mapping[i].ext3_index;
     int graphic = property_mapping[i].artwork_index;
 
-    if (special == GFX_SPECIAL_ARG_EDITOR)
-      element_info[element].editor_graphic = graphic;
-    else if (special == GFX_SPECIAL_ARG_PREVIEW)
-      element_info[element].preview_graphic = graphic;
-  }
-}
+    if (element >= MAX_NUM_ELEMENTS)
+      continue;
 
-static void InitElementSoundInfo()
-{
-  /* !!! soon to come !!! */
+    if (special >= 0 && special < NUM_SPECIAL_GFX_ARGS)
+      element_info[element].special_graphic[special] = graphic;
+  }
 }
 
 static void set_graphic_parameters(int graphic, char **parameter_raw)
 {
   Bitmap *src_bitmap = getBitmapFromImageID(graphic);
-  int num_xtiles = (src_bitmap ? src_bitmap->width          : TILEX) / TILEX;
-  int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY;
   int parameter[NUM_GFX_ARGS];
+  int anim_frames_per_row = 1, anim_frames_per_col = 1;
+  int anim_frames_per_line = 1;
   int i;
 
   /* get integer values from string parameters */
   for (i=0; i < NUM_GFX_ARGS; i++)
     parameter[i] =
-      get_parameter_value(image_config_suffix[i].type, parameter_raw[i]);
+      get_parameter_value(image_config_suffix[i].token, parameter_raw[i],
+                         image_config_suffix[i].type);
 
   graphic_info[graphic].bitmap = src_bitmap;
 
@@ -901,20 +614,26 @@ static void set_graphic_parameters(int graphic, char **parameter_raw)
   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;
+  }
+
   /* correct x or y offset dependant of vertical or horizontal frame order */
   if (parameter[GFX_ARG_VERTICAL])     /* frames are ordered vertically */
   {
-    if (parameter[GFX_ARG_OFFSET] != ARG_UNDEFINED_VALUE)
-      graphic_info[graphic].offset_y = parameter[GFX_ARG_OFFSET];
-    else
-      graphic_info[graphic].offset_y = graphic_info[graphic].height;
+    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 */
   {
-    if (parameter[GFX_ARG_OFFSET] != ARG_UNDEFINED_VALUE)
-      graphic_info[graphic].offset_x = parameter[GFX_ARG_OFFSET];
-    else
-      graphic_info[graphic].offset_x = graphic_info[graphic].width;
+    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;
   }
 
   /* optionally, the x and y offset of frames can be specified directly */
@@ -927,36 +646,24 @@ static void set_graphic_parameters(int graphic, char **parameter_raw)
   if (parameter[GFX_ARG_FRAMES] != ARG_UNDEFINED_VALUE)
     graphic_info[graphic].anim_frames = parameter[GFX_ARG_FRAMES];
   else if (parameter[GFX_ARG_XPOS] == 0 && !parameter[GFX_ARG_VERTICAL])
-    graphic_info[graphic].anim_frames =        num_xtiles;
+    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 =        num_ytiles;
+    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;
 
-  /* set mode for animation frame order */
-  if (parameter[GFX_ARG_MODE_LOOP])
-    graphic_info[graphic].anim_mode = ANIM_LOOP;
-  else if (parameter[GFX_ARG_MODE_LINEAR])
-    graphic_info[graphic].anim_mode = ANIM_LINEAR;
-  else if (parameter[GFX_ARG_MODE_PINGPONG])
-    graphic_info[graphic].anim_mode = ANIM_PINGPONG;
-  else if (parameter[GFX_ARG_MODE_PINGPONG2])
-    graphic_info[graphic].anim_mode = ANIM_PINGPONG2;
-  else if (parameter[GFX_ARG_MODE_RANDOM])
-    graphic_info[graphic].anim_mode = ANIM_RANDOM;
-  else if (graphic_info[graphic].anim_frames > 1)
-    graphic_info[graphic].anim_mode = ANIM_LOOP;
-  else
+  graphic_info[graphic].anim_mode = parameter[GFX_ARG_ANIM_MODE];
+  if (graphic_info[graphic].anim_frames == 1)
     graphic_info[graphic].anim_mode = ANIM_NONE;
 
-  /* set additional flag to play animation frames in reverse order */
-  if (parameter[GFX_ARG_MODE_REVERSE])
-    graphic_info[graphic].anim_mode |= ANIM_REVERSE;
-
   /* automatically determine correct start frame, if not defined */
   if (parameter[GFX_ARG_START_FRAME] == ARG_UNDEFINED_VALUE)
     graphic_info[graphic].anim_start_frame = 0;
@@ -972,17 +679,22 @@ static void set_graphic_parameters(int graphic, char **parameter_raw)
   /* 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];
 }
 
 static void InitGraphicInfo()
 {
-  static boolean clipmasks_initialized = FALSE;
   int fallback_graphic = IMG_CHAR_EXCLAM;
   struct FileInfo *fallback_image = getImageListEntry(fallback_graphic);
   Bitmap *fallback_bitmap = getBitmapFromImageID(fallback_graphic);
   int num_images = getImageListSize();
   int i;
+
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  static boolean clipmasks_initialized = FALSE;
   Pixmap src_pixmap;
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
@@ -1104,6 +816,7 @@ static void InitGraphicInfo()
     clip_gc_values.graphics_exposures = False;
     clip_gc_values.clip_mask = graphic_info[i].clip_mask;
     clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
+
     graphic_info[i].clip_gc =
       XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
 #endif
@@ -1112,47 +825,130 @@ static void InitGraphicInfo()
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
   if (copy_clipmask_gc)
     XFreeGC(display, copy_clipmask_gc);
-#endif
 
   clipmasks_initialized = TRUE;
+#endif
 }
 
-static void set_sound_parameters(int sound, char **parameter_raw)
+static void InitElementSoundInfo()
 {
-  int parameter[NUM_SND_ARGS];
-  int i;
-
-  /* get integer values from string parameters */
-  for (i=0; i < NUM_SND_ARGS; i++)
-    parameter[i] =
-      get_parameter_value(sound_config_suffix[i].type, parameter_raw[i]);
-
-  /* explicit loop mode setting in configuration overrides default value */
-  if (parameter[SND_ARG_MODE_LOOP] != ARG_UNDEFINED_VALUE)
-    sound_info[sound].loop = parameter[SND_ARG_MODE_LOOP];
-}
+  struct PropertyMapping *property_mapping = getSoundListPropertyMapping();
+  int num_property_mappings = getSoundListPropertyMappingSize();
+  int i, j, act;
 
-static void InitSoundInfo()
-{
-  int *sound_effect_properties;
-  int num_sounds = getSoundListSize();
-  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;
 
-  if (sound_info != NULL)
-    free(sound_info);
+  /* initialize element/sound mapping from static configuration */
+  for (i=0; element_to_sound[i].element > -1; i++)
+  {
+    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;
 
-  sound_effect_properties = checked_calloc(num_sounds * sizeof(int));
-  sound_info = checked_calloc(num_sounds * sizeof(struct SoundInfo));
+    if (action < 0)
+      action = ACTION_DEFAULT;
 
-  /* 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;
+    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;
+  }
 
-  for (i=0; i<num_sounds; i++)
+  /* initialize element/sound mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
   {
-    struct FileInfo *sound = getSoundListEntry(i);
-    int len_effect_text = strlen(sound->token);
+    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;
@@ -1178,13 +974,13 @@ static void InitSoundInfo()
 
     for (j=0; j<MAX_NUM_ELEMENTS; j++)
     {
-      if (element_info[j].sound_class_name)
+      if (element_info[j].class_name)
       {
-       int len_class_text = strlen(element_info[j].sound_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].sound_class_name, len_class_text) == 0 &&
+                   element_info[j].class_name, len_class_text) == 0 &&
            sound->token[len_class_text] == '.')
        {
          int sound_action_value = sound_effect_properties[i];
@@ -1199,6 +995,37 @@ static void InitSoundInfo()
 
   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 */
   {
@@ -1211,13 +1038,46 @@ static void InitSoundInfo()
       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]);
+              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;
@@ -1227,9 +1087,9 @@ void InitElementProperties()
     EL_AMOEBA_WET,
     EL_AMOEBA_DRY,
     EL_AMOEBA_FULL,
-    EL_BD_AMOEBA
+    EL_BD_AMOEBA,
+    -1
   };
-  static int ep_amoebalive_num = SIZEOF_ARRAY_INT(ep_amoebalive);
 
   static int ep_amoeboid[] =
   {
@@ -1237,41 +1097,37 @@ void InitElementProperties()
     EL_AMOEBA_WET,
     EL_AMOEBA_DRY,
     EL_AMOEBA_FULL,
-    EL_BD_AMOEBA
+    EL_BD_AMOEBA,
+    -1
   };
-  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_can_be_crumbled[] =
+  {
+    EL_SAND,
+    EL_LANDMINE,
+    EL_TRAP,
+    EL_TRAP_ACTIVE,
+    -1
   };
-  static int ep_schluessel_num = SIZEOF_ARRAY_INT(ep_schluessel);
 
   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,
@@ -1280,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,
@@ -1290,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,
@@ -1312,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,
@@ -1328,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,
@@ -1390,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,
@@ -1429,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,
@@ -1439,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,
@@ -1492,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,
@@ -1521,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,
@@ -1531,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[] =
   {
@@ -1555,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[] =
   {
@@ -1583,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,
@@ -1642,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[] =
   {
@@ -1681,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[] =
   {
@@ -1706,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[] =
   {
@@ -1719,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[] =
   {
@@ -1741,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[] =
   {
@@ -1766,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[] =
   {
@@ -1795,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,
@@ -1822,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[] =
   {
@@ -1839,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,
@@ -1851,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[] =
   {
@@ -1862,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[] =
   {
@@ -1874,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[] =
   {
@@ -1890,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,
@@ -1924,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,
@@ -1945,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,
@@ -1999,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,
@@ -2037,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,
@@ -2050,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[] =
   {
@@ -2069,30 +1932,32 @@ 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,
@@ -2100,100 +1965,87 @@ void InitElementProperties()
     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,
@@ -2203,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,
@@ -2280,173 +2133,242 @@ 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 long ep2_bit[] =
+
+  static int ep_sp_element[] =
   {
-    EP_BIT_BELT,
-    EP_BIT_BELT_ACTIVE,
-    EP_BIT_BELT_SWITCH,
-    EP_BIT_TUBE
-  };
-  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
+    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 int *ep2_array[] =
+
+  static int ep_has_content[] =
   {
-    ep_belt,
-    ep_belt_active,
-    ep_belt_switch,
-    ep_tube
+    EL_YAMYAM,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    -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
+
+  static int ep_solid_new[] =
+  {
+    -1
   };
-  static int *ep2_num[] =
+
+  static struct
   {
-    &ep_belt_num,
-    &ep_belt_active_num,
-    &ep_belt_switch_num,
-    &ep_tube_num
+    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                      }
+  };
+
+#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 num_properties1 = SIZEOF_ARRAY(ep1_num, int *);
-  static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *);
+#endif
 
+  /* always start with reliable default values (no properties) */
   for (i=0; i<MAX_NUM_ELEMENTS; i++)
-  {
-    Properties1[i] = 0;
-    Properties2[i] = 0;
-  }
+    for (j=0; j<NUM_EP_BITFIELDS; j++)
+      Properties[i][j] = EP_BITMASK_DEFAULT;
 
-  for (i=0; i<num_properties1; i++)
-    for (j=0; j<*(ep1_num[i]); j++)
-      Properties1[(ep1_array[i])[j]] |= ep1_bit[i];
-  for (i=0; i<num_properties2; i++)
-    for (j=0; j<*(ep2_num[i]); j++)
-      Properties2[(ep2_array[i])[j]] |= ep2_bit[i];
+  /* 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++)
-    Properties1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
-}
+    SET_PROPERTY(i, EP_INACTIVE, TRUE);
 
-void Execute_Command(char *command)
-{
-  if (strcmp(command, "print graphicsinfo.conf") == 0)
+#if 0
+  /* determine inactive elements (used for engine main loop optimization) */
+  for (i=0; i < MAX_NUM_ELEMENTS; i++)
   {
-    int i;
-
-    printf("# You can configure additional/alternative image files here.\n");
-    printf("# (The images below are default and therefore commented out.)\n");
-    printf("\n");
-    printf("%s\n", getFormattedSetupEntry("name", "Classic Graphics"));
-    printf("\n");
-    printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
-    printf("\n");
+    boolean active = FALSE;
 
-    for (i=0; image_config[i].token != NULL; i++)
-      printf("# %s\n",
-            getFormattedSetupEntry(image_config[i].token,
-                                   image_config[i].value));
+    for (j=0; i < NUM_ELEMENT_PROPERTIES; j++)
+    {
+      if (HAS_PROPERTY(i, j))
+       active = TRUE;
+    }
 
-    exit(0);
+#if 0
+    if (!active)
+      SET_PROPERTY(i, EP_INACTIVE, TRUE);
+#endif
+  }
+#endif
+
+#if 0
+  for (i=0; i < MAX_NUM_ELEMENTS; i++)
+  {
+    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
+}
+
+static void InitGlobal()
+{
+  global.autoplay_leveldir = NULL;
+
+  global.frames_per_second = 0;
+  global.fps_slowdown = FALSE;
+  global.fps_slowdown_factor = 1;
+}
+
+void Execute_Command(char *command)
+{
+  if (strcmp(command, "print graphicsinfo.conf") == 0)
+  {
+    int i;
+
+    printf("# You can configure additional/alternative image files here.\n");
+    printf("# (The images below are default and therefore commented out.)\n");
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("name", "Classic Graphics"));
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+    printf("\n");
+
+    for (i=0; image_config[i].token != NULL; i++)
+      printf("# %s\n",
+            getFormattedSetupEntry(image_config[i].token,
+                                   image_config[i].value));
+
+    exit(0);
   }
   else if (strcmp(command, "print soundsinfo.conf") == 0)
   {
@@ -2521,6 +2443,463 @@ void Execute_Command(char *command)
   }
 }
 
+static void InitSetup()
+{
+  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();
@@ -2531,9 +2910,6 @@ void CloseAllAndExit(int exit_value)
   FreeAllImages();
   FreeTileClipmasks();
 
-  if (bitmap_font_initial)
-    FreeBitmap(bitmap_font_initial);
-
   CloseVideoDisplay();
   ClosePlatformDependantStuff();