rnd-20020914-1-src
[rocksndiamonds.git] / src / init.c
index 70604f2a9392854cd4bda2dc4fc30ad16bcb6105..9b553f1e419672c5990263cd805a235cb1ba70cf 100644 (file)
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2001 Artsoft Entertainment                      *
+* (c) 1995-2002 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
 #include "files.h"
 #include "network.h"
 #include "netserv.h"
+#include "cartoons.h"
+#include "config.h"
 
 static char *image_filename[NUM_PICTURES] =
 {
   "RocksScreen.pcx",
+  "RocksElements.pcx",
   "RocksDoor.pcx",
   "RocksHeroes.pcx",
   "RocksToons.pcx",
   "RocksSP.pcx",
   "RocksDC.pcx",
   "RocksMore.pcx",
-  "RocksFont.pcx",
-  "RocksFont2.pcx",
-  "RocksFont3.pcx"
+  "RocksFontBig.pcx",
+  "RocksFontSmall.pcx",
+  "RocksFontMedium.pcx",
+  "RocksFontEM.pcx"
 }; 
 
+static void InitSetup(void);
 static void InitPlayerInfo(void);
 static void InitLevelInfo(void);
+static void InitArtworkInfo(void);
+static void InitLevelArtworkInfo(void);
 static void InitNetworkServer(void);
+static void InitImages(void);
+static void InitMixer(void);
 static void InitSound(void);
 static void InitGfx(void);
-static void InitCustomGraphics(void);
 static void InitGfxBackground(void);
 static void InitGadgets(void);
 static void InitElementProperties(void);
+static void InitElementInfo(void);
+static void InitGraphicInfo(void);
+static void InitSoundInfo();
+static void Execute_Debug_Command(char *);
 
 void OpenAll(void)
 {
+  if (options.debug_command)
+  {
+    Execute_Debug_Command(options.debug_command);
+
+    exit(0);
+  }
+
   if (options.serveronly)
   {
 #if defined(PLATFORM_UNIX)
@@ -61,15 +80,17 @@ void OpenAll(void)
   }
 
   InitProgramInfo(UNIX_USERDATA_DIRECTORY,
-                 PROGRAM_TITLE_STRING, WINDOW_TITLE_STRING,
+                 PROGRAM_TITLE_STRING, getWindowTitleString(),
                  ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME,
                  MSDOS_POINTER_FILENAME,
                  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
 
+  InitSetup();
   InitPlayerInfo();
+  InitArtworkInfo();           /* needed before loading gfx, sound & music */
 
   InitCounter();
-  InitSound();
+  InitMixer();
   InitJoysticks();
   InitRND(NEW_RANDOMIZE);
 
@@ -81,18 +102,27 @@ void OpenAll(void)
 
   InitGfx();
   InitElementProperties();     /* initializes IS_CHAR() for el2gfx() */
+  InitElementInfo();
 
   InitLevelInfo();
+  InitLevelArtworkInfo();
   InitGadgets();               /* needs to know number of level series */
-
-  InitCustomGraphics();
+  InitImages();                        /* needs to know current level directory */
+  InitSound();                 /* needs to know current level directory */
 
   InitGfxBackground();
+  InitToons();
+
   DrawMainMenu();
 
   InitNetworkServer();
 }
 
+void InitSetup()
+{
+  LoadSetup();                                 /* global setup info */
+}
+
 void InitPlayerInfo()
 {
   int i;
@@ -104,8 +134,6 @@ void InitPlayerInfo()
     stored_player[i].connected = FALSE;
 
   local_player->connected = TRUE;
-
-  LoadSetup();                                 /* global setup info */
 }
 
 void InitLevelInfo()
@@ -115,6 +143,16 @@ void InitLevelInfo()
   LoadLevelSetup_SeriesInfo();                 /* last played level info */
 }
 
+void InitArtworkInfo()
+{
+  LoadArtworkInfo();
+}
+
+void InitLevelArtworkInfo()
+{
+  LoadLevelArtworkInfo();
+}
+
 void InitNetworkServer()
 {
 #if defined(PLATFORM_UNIX)
@@ -138,38 +176,43 @@ void InitNetworkServer()
 #endif
 }
 
-void InitSound()
+static void InitImages()
 {
-  int i;
+  InitImageList(image_config, image_config_suffix, NUM_IMAGE_FILES);
 
+  /* load custom images */
+  ReloadCustomImages();
+
+  InitGraphicInfo();
+}
+
+static void InitMixer()
+{
   OpenAudio();
 
-  for(i=0; i<NUM_SOUNDS; i++)
-  {
-    if (!LoadSound(sound_name[i]))
-    {
-      audio.sound_available = FALSE;
-      audio.loops_available = FALSE;
-      audio.sound_enabled = FALSE;
+  InitSoundList(sound_config, sound_config_suffix, NUM_SOUND_FILES);
 
-      return;
-    }
-  }
+  StartMixer();
+}
 
-  num_bg_loops = LoadMusic();
+static void InitSound()
+{
+  /* load custom sounds and music */
+  InitReloadSounds(artwork.snd_current->identifier);
+  InitReloadMusic(artwork.mus_current->identifier);
 
-  StartSoundserver();
+  InitSoundInfo();
 }
 
-void InitTileClipmasks()
+static void InitTileClipmasks()
 {
 #if defined(TARGET_X11)
-  GC copy_clipmask_gc;
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
-#endif
 
 #if defined(TARGET_X11_NATIVE)
+  GC copy_clipmask_gc;
+
   static struct
   {
     int start;
@@ -221,7 +264,8 @@ void InitTileClipmasks()
     { GFX2_SHIELD_ACTIVE, 3 },
     { -1, 0 }
   };
-#endif
+#endif /* TARGET_X11_NATIVE */
+#endif /* TARGET_X11 */
 
   int i;
 
@@ -235,17 +279,10 @@ void InitTileClipmasks()
      To prevent this, create small (tile-sized) mask Pixmaps which will then
      be set much faster with XSetClipOrigin() and speed things up a lot. */
 
-  /* create graphic context structures needed for clipping */
   clip_gc_values.graphics_exposures = False;
   clip_gc_valuemask = GCGraphicsExposures;
-  copy_clipmask_gc =
-    XCreateGC(display, pix[PIX_BACK]->clip_mask,
-             clip_gc_valuemask, &clip_gc_values);
-
-  clip_gc_values.graphics_exposures = False;
-  clip_gc_valuemask = GCGraphicsExposures;
-  tile_clip_gc =
-    XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
+  tile_clip_gc = XCreateGC(display, window->drawable,
+                          clip_gc_valuemask, &clip_gc_values);
 
   for(i=0; i<NUM_BITMAPS; i++)
   {
@@ -255,11 +292,18 @@ void InitTileClipmasks()
       clip_gc_values.clip_mask = pix[i]->clip_mask;
       clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
       pix[i]->stored_clip_gc = XCreateGC(display, window->drawable,
-                                        clip_gc_valuemask,&clip_gc_values);
+                                        clip_gc_valuemask, &clip_gc_values);
     }
   }
 
 #if defined(TARGET_X11_NATIVE)
+
+  /* create graphic context structures needed for clipping */
+  clip_gc_values.graphics_exposures = False;
+  clip_gc_valuemask = GCGraphicsExposures;
+  copy_clipmask_gc = XCreateGC(display, pix[PIX_BACK]->clip_mask,
+                              clip_gc_valuemask, &clip_gc_values);
+
   /* create only those clipping Pixmaps we really need */
   for(i=0; tile_needs_clipping[i].start>=0; i++)
   {
@@ -270,11 +314,11 @@ void InitTileClipmasks()
       int tile = tile_needs_clipping[i].start + j;
       int graphic = tile;
       int src_x, src_y;
-      int pixmap_nr;
+      Bitmap *src_bitmap;
       Pixmap src_pixmap;
 
-      getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
-      src_pixmap = pix[pixmap_nr]->clip_mask;
+      getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+      src_pixmap = src_bitmap->clip_mask;
 
       tile_clipmask[tile] = XCreatePixmap(display, window->drawable,
                                          TILEX, TILEY, 1);
@@ -283,13 +327,44 @@ void InitTileClipmasks()
                src_x, src_y, TILEX, TILEY, 0, 0);
     }
   }
+
+  XFreeGC(display, copy_clipmask_gc);
+
 #endif /* TARGET_X11_NATIVE */
 #endif /* TARGET_X11 */
 }
 
+void FreeTileClipmasks()
+{
+#if defined(TARGET_X11)
+  int i;
+
+  for(i=0; i<NUM_TILES; i++)
+  {
+    if (tile_clipmask[i] != None)
+    {
+      XFreePixmap(display, tile_clipmask[i]);
+      tile_clipmask[i] = None;
+    }
+  }
+
+  if (tile_clip_gc)
+    XFreeGC(display, tile_clip_gc);
+  tile_clip_gc = None;
+
+  for(i=0; i<NUM_BITMAPS; i++)
+  {
+    if (pix[i] != NULL && pix[i]->stored_clip_gc)
+    {
+      XFreeGC(display, pix[i]->stored_clip_gc);
+      pix[i]->stored_clip_gc = None;
+    }
+  }
+#endif /* TARGET_X11 */
+}
+
 void InitGfx()
 {
-  char *filename;
   int i;
 
   /* initialize some global variables */
@@ -308,101 +383,166 @@ void InitGfx()
   pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
   pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
 
-  filename = getImageFilename(image_filename[PIX_SMALLFONT]);
-  if ((pix_default[PIX_SMALLFONT] = LoadImage(filename)) == NULL)
-    Error(ERR_EXIT, "LoadImage() failed: %s", GetError());
-  pix_custom[PIX_SMALLFONT] = NULL;
-  pix[PIX_SMALLFONT] = pix_default[PIX_SMALLFONT];
+  pix[PIX_FONT_SMALL] = LoadCustomImage(image_filename[PIX_FONT_SMALL]);
 
-  InitFontInfo(NULL, NULL, pix[PIX_SMALLFONT]);
+  InitFontInfo(NULL, NULL, pix[PIX_FONT_SMALL], NULL);
 
   DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
   DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
-#if defined(PLATFORM_MSDOS)
-  DrawInitText(PROGRAM_DOS_PORT_STRING, 210, FC_BLUE);
-  rest(200);
-#endif
-  DrawInitText("Loading graphics:",120,FC_GREEN);
+
+  DrawInitText("Loading graphics:", 120, FC_GREEN);
 
   for(i=0; i<NUM_PICTURES; i++)
   {
-    if (i != PIX_SMALLFONT)
+    if (i != PIX_FONT_SMALL)
     {
       DrawInitText(image_filename[i], 150, FC_YELLOW);
 
-      filename = getImageFilename(image_filename[i]);
-      if ((pix_default[i] = LoadImage(filename)) == NULL)
-       Error(ERR_EXIT, "LoadImage() failed: %s", GetError());
-      pix_custom[i] = NULL;
-      pix[i] = pix_default[i];
+      pix[i] = LoadCustomImage(image_filename[i]);
     }
   }
 
-  InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]);
+  InitFontInfo(pix[PIX_FONT_BIG], pix[PIX_FONT_MEDIUM], pix[PIX_FONT_SMALL],
+              pix[PIX_FONT_EM]);
 
   InitTileClipmasks();
 }
 
-void LoadCustomGraphics()
+void InitGfxBackground()
 {
-#if 0
-  int i;
+  int x, y;
 
-  for(i=0; i<NUM_PICTURES; i++)
-  {
-    Bitmap *new_pic = 
-    pix_custom[i] = LoadImage(image_filename[i]);
-  }
-#endif
+  drawto = backbuffer;
+  fieldbuffer = pix[PIX_DB_FIELD];
+  SetDrawtoField(DRAW_BACKBUFFER);
+
+  BlitBitmap(pix[PIX_BACK], backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+  ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
+  ClearRectangle(pix[PIX_DB_DOOR], 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE);
+
+  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 InitCustomGraphics()
+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;
+
 #if 0
-  static char *filename = NULL;
+  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
 
-  /* look for optional directory ~/.<program>/graphics */
-  filename = getPath2(getUserDataDir(), GRAPHICS_DIRECTORY);
-  if (access(dir, F_OK) == 0)
+  /* leveldir_current may be invalid (level group, parent link) */
+  if (!validLevelSeries(leveldir_current))
+    return;
+
+#if 0
+  printf("--> '%s'\n", artwork.gfx_current_identifier);
+#endif
+
+  /* when a new level series was selected, check if there was a change
+     in custom artwork stored in level series directory */
+  if (leveldir_current_identifier != leveldir_current->identifier)
   {
+    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)
+  {
+    int i;
 
+    setLevelArtworkDir(artwork.gfx_first);
 
+    ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
-(leveldir_current->user_defined ?
-                      getUserLevelDir("") :
-                      options.level_directory),
-                     leveldir_current->fullpath,
-                     basename);
+    for(i=0; i<NUM_PICTURES; i++)
+    {
+      DrawInitText(image_filename[i], 150, FC_YELLOW);
+      ReloadCustomImage(pix[i], image_filename[i]);
+    }
 
+    ReloadCustomImages();
+    InitGraphicInfo();
 
+    FreeTileClipmasks();
+    InitTileClipmasks();
+    InitGfxBackground();
 
-  filename = getPath3((leveldir_current->user_defined ?
-                      getUserLevelDir("") :
-                      options.level_directory),
-                     leveldir_current->fullpath,
-                     basename);
-#endif
-}
+    /* force redraw of (open or closed) door graphics */
+    SetDoorState(DOOR_OPEN_ALL);
+    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
 
-void InitGfxBackground()
-{
-  int x, y;
+    artwork.gfx_current_identifier = gfx_new_identifier;
+    last_override_level_graphics = setup.override_level_graphics;
+  }
 
-  drawto = backbuffer;
-  fieldbuffer = pix[PIX_DB_FIELD];
-  SetDrawtoField(DRAW_BACKBUFFER);
+  if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 ||
+      last_override_level_sounds != setup.override_level_sounds)
+  {
+    /* set artwork path to send it to the sound server process */
+    setLevelArtworkDir(artwork.snd_first);
 
-  BlitBitmap(pix[PIX_BACK], backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
-  ClearRectangle(backbuffer, REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
-  ClearRectangle(pix[PIX_DB_DOOR], 0,0, 3*DXSIZE,DYSIZE+VYSIZE);
+    InitReloadSounds(snd_new_identifier);
 
-  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;
+    artwork.snd_current_identifier = snd_new_identifier;
+    last_override_level_sounds = setup.override_level_sounds;
+  }
+
+  if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 ||
+      last_override_level_music != setup.override_level_music)
+  {
+    /* set artwork path to send it to the sound server process */
+    setLevelArtworkDir(artwork.mus_first);
+
+    InitReloadMusic(mus_new_identifier);
+
+    artwork.mus_current_identifier = mus_new_identifier;
+    last_override_level_music = setup.override_level_music;
+  }
+
+#if 0
+  printf("<-- '%s'\n", artwork.gfx_current_identifier);
+#endif
 }
 
 void InitGadgets()
@@ -414,9 +554,373 @@ void InitGadgets()
   CreateScreenGadgets();
 }
 
+void InitElementInfo()
+{
+  int i;
+
+  static struct
+  {
+    int element;
+    int graphic;
+  }
+  element_to_graphic[] =
+  {
+    { EL_LEERRAUM,                     GFX_LEERRAUM            },
+    { EL_ERDREICH,                     GFX_ERDREICH            },
+    { EL_MAUERWERK,                    GFX_MAUERWERK           },
+    { EL_FELSBODEN,                    GFX_FELSBODEN           },
+    { EL_FELSBROCKEN,                  GFX_FELSBROCKEN         },
+    { EL_SCHLUESSEL,                   GFX_SCHLUESSEL          },
+    { EL_EDELSTEIN,                    GFX_EDELSTEIN           },
+    { EL_AUSGANG_ZU,                   GFX_AUSGANG_ZU          },
+    { EL_AUSGANG_ACT,                  GFX_AUSGANG_ACT         },
+    { EL_AUSGANG_AUF,                  GFX_AUSGANG_AUF         },
+    { EL_SPIELFIGUR,                   GFX_SPIELFIGUR          },
+    { EL_SPIELER1,                     GFX_SPIELER1            },
+    { EL_SPIELER2,                     GFX_SPIELER2            },
+    { EL_SPIELER3,                     GFX_SPIELER3            },
+    { EL_SPIELER4,                     GFX_SPIELER4            },
+    { EL_KAEFER,                       GFX_KAEFER              },
+    { EL_KAEFER_RIGHT,                 GFX_KAEFER_RIGHT        },
+    { EL_KAEFER_UP,                    GFX_KAEFER_UP           },
+    { EL_KAEFER_LEFT,                  GFX_KAEFER_LEFT         },
+    { EL_KAEFER_DOWN,                  GFX_KAEFER_DOWN         },
+    { EL_FLIEGER,                      GFX_FLIEGER             },
+    { EL_FLIEGER_RIGHT,                        GFX_FLIEGER_RIGHT       },
+    { EL_FLIEGER_UP,                   GFX_FLIEGER_UP          },
+    { EL_FLIEGER_LEFT,                 GFX_FLIEGER_LEFT        },
+    { EL_FLIEGER_DOWN,                 GFX_FLIEGER_DOWN        },
+    { EL_BUTTERFLY,                    GFX_BUTTERFLY           },
+    { EL_BUTTERFLY_RIGHT,              GFX_BUTTERFLY_RIGHT     },
+    { EL_BUTTERFLY_UP,                 GFX_BUTTERFLY_UP        },
+    { EL_BUTTERFLY_LEFT,               GFX_BUTTERFLY_LEFT      },
+    { EL_BUTTERFLY_DOWN,               GFX_BUTTERFLY_DOWN      },
+    { EL_FIREFLY,                      GFX_FIREFLY             },
+    { EL_FIREFLY_RIGHT,                        GFX_FIREFLY_RIGHT       },
+    { EL_FIREFLY_UP,                   GFX_FIREFLY_UP          },
+    { EL_FIREFLY_LEFT,                 GFX_FIREFLY_LEFT        },
+    { EL_FIREFLY_DOWN,                 GFX_FIREFLY_DOWN        },
+    { EL_MAMPFER,                      GFX_MAMPFER             },
+    { EL_ROBOT,                                GFX_ROBOT               },
+    { EL_BETON,                                GFX_BETON               },
+    { EL_DIAMANT,                      GFX_DIAMANT             },
+    { EL_MORAST_LEER,                  GFX_MORAST_LEER         },
+    { EL_MORAST_VOLL,                  GFX_MORAST_VOLL         },
+    { EL_QUICKSAND_EMPTYING,           GFX_MORAST_LEER         },
+    { EL_TROPFEN,                      GFX_TROPFEN             },
+    { EL_BOMBE,                                GFX_BOMBE               },
+    { EL_MAGIC_WALL_OFF,               GFX_MAGIC_WALL_OFF      },
+    { EL_MAGIC_WALL_EMPTY,             GFX_MAGIC_WALL_EMPTY    },
+    { EL_MAGIC_WALL_EMPTYING,          GFX_MAGIC_WALL_EMPTY    },
+    { EL_MAGIC_WALL_FULL,              GFX_MAGIC_WALL_FULL     },
+    { EL_MAGIC_WALL_DEAD,              GFX_MAGIC_WALL_DEAD     },
+    { EL_SALZSAEURE,                   GFX_SALZSAEURE          },
+    { EL_AMOEBE_TOT,                   GFX_AMOEBE_TOT          },
+    { EL_AMOEBE_NASS,                  GFX_AMOEBE_NASS         },
+    { EL_AMOEBE_NORM,                  GFX_AMOEBE_NORM         },
+    { EL_AMOEBE_VOLL,                  GFX_AMOEBE_VOLL         },
+    { EL_AMOEBE_BD,                    GFX_AMOEBE_BD           },
+    { EL_AMOEBA2DIAM,                  GFX_AMOEBA2DIAM         },
+    { EL_AMOEBA_DRIPPING,              GFX_AMOEBE_NASS         },
+    { EL_KOKOSNUSS,                    GFX_KOKOSNUSS           },
+    { EL_LIFE,                         GFX_LIFE                },
+    { EL_LIFE_ASYNC,                   GFX_LIFE_ASYNC          },
+    { EL_DYNAMITE_ACTIVE,              GFX_DYNAMIT             },
+    { EL_BADEWANNE,                    GFX_BADEWANNE           },
+    { EL_BADEWANNE1,                   GFX_BADEWANNE1          },
+    { EL_BADEWANNE2,                   GFX_BADEWANNE2          },
+    { EL_BADEWANNE3,                   GFX_BADEWANNE3          },
+    { EL_BADEWANNE4,                   GFX_BADEWANNE4          },
+    { EL_BADEWANNE5,                   GFX_BADEWANNE5          },
+    { EL_ABLENK_AUS,                   GFX_ABLENK_AUS          },
+    { EL_ABLENK_EIN,                   GFX_ABLENK_EIN          },
+    { EL_SCHLUESSEL1,                  GFX_SCHLUESSEL1         },
+    { EL_SCHLUESSEL2,                  GFX_SCHLUESSEL2         },
+    { EL_SCHLUESSEL3,                  GFX_SCHLUESSEL3         },
+    { EL_SCHLUESSEL4,                  GFX_SCHLUESSEL4         },
+    { EL_PFORTE1,                      GFX_PFORTE1             },
+    { EL_PFORTE2,                      GFX_PFORTE2             },
+    { EL_PFORTE3,                      GFX_PFORTE3             },
+    { EL_PFORTE4,                      GFX_PFORTE4             },
+    { EL_PFORTE1X,                     GFX_PFORTE1X            },
+    { EL_PFORTE2X,                     GFX_PFORTE2X            },
+    { EL_PFORTE3X,                     GFX_PFORTE3X            },
+    { EL_PFORTE4X,                     GFX_PFORTE4X            },
+    { EL_DYNAMITE_INACTIVE,            GFX_DYNAMIT_AUS         },
+    { EL_PACMAN,                       GFX_PACMAN              },
+    { EL_PACMAN_RIGHT,                 GFX_PACMAN_RIGHT        },
+    { EL_PACMAN_UP,                    GFX_PACMAN_UP           },
+    { EL_PACMAN_LEFT,                  GFX_PACMAN_LEFT         },
+    { EL_PACMAN_DOWN,                  GFX_PACMAN_DOWN         },
+    { EL_UNSICHTBAR,                   GFX_UNSICHTBAR          },
+    { EL_ERZ_EDEL,                     GFX_ERZ_EDEL            },
+    { EL_ERZ_DIAM,                     GFX_ERZ_DIAM            },
+    { EL_BIRNE_AUS,                    GFX_BIRNE_AUS           },
+    { EL_BIRNE_EIN,                    GFX_BIRNE_EIN           },
+    { EL_ZEIT_VOLL,                    GFX_ZEIT_VOLL           },
+    { EL_ZEIT_LEER,                    GFX_ZEIT_LEER           },
+    { EL_MAUER_LEBT,                   GFX_MAUER_LEBT          },
+    { EL_MAUER_X,                      GFX_MAUER_X             },
+    { EL_MAUER_Y,                      GFX_MAUER_Y             },
+    { EL_MAUER_XY,                     GFX_MAUER_XY            },
+    { EL_EDELSTEIN_BD,                 GFX_EDELSTEIN_BD        },
+    { EL_EDELSTEIN_GELB,               GFX_EDELSTEIN_GELB      },
+    { EL_EDELSTEIN_ROT,                        GFX_EDELSTEIN_ROT       },
+    { EL_EDELSTEIN_LILA,               GFX_EDELSTEIN_LILA      },
+    { EL_ERZ_EDEL_BD,                  GFX_ERZ_EDEL_BD         },
+    { EL_ERZ_EDEL_GELB,                        GFX_ERZ_EDEL_GELB       },
+    { EL_ERZ_EDEL_ROT,                 GFX_ERZ_EDEL_ROT        },
+    { EL_ERZ_EDEL_LILA,                        GFX_ERZ_EDEL_LILA       },
+    { EL_MAMPFER2,                     GFX_MAMPFER2            },
+    { EL_MAGIC_WALL_BD_OFF,            GFX_MAGIC_WALL_BD_OFF   },
+    { EL_MAGIC_WALL_BD_EMPTY,          GFX_MAGIC_WALL_BD_EMPTY },
+    { EL_MAGIC_WALL_BD_EMPTYING,       GFX_MAGIC_WALL_BD_EMPTY },
+    { EL_MAGIC_WALL_BD_FULL,           GFX_MAGIC_WALL_BD_FULL  },
+    { EL_MAGIC_WALL_BD_DEAD,           GFX_MAGIC_WALL_BD_DEAD  },
+    { EL_DYNABOMB_ACTIVE_1,            GFX_DYNABOMB            },
+    { EL_DYNABOMB_ACTIVE_2,            GFX_DYNABOMB            },
+    { EL_DYNABOMB_ACTIVE_3,            GFX_DYNABOMB            },
+    { EL_DYNABOMB_ACTIVE_4,            GFX_DYNABOMB            },
+    { EL_DYNABOMB_NR,                  GFX_DYNABOMB_NR         },
+    { EL_DYNABOMB_SZ,                  GFX_DYNABOMB_SZ         },
+    { EL_DYNABOMB_XL,                  GFX_DYNABOMB_XL         },
+    { EL_SOKOBAN_OBJEKT,               GFX_SOKOBAN_OBJEKT      },
+    { EL_SOKOBAN_FELD_LEER,            GFX_SOKOBAN_FELD_LEER   },
+    { EL_SOKOBAN_FELD_VOLL,            GFX_SOKOBAN_FELD_VOLL   },
+    { EL_MOLE,                         GFX_MOLE                },
+    { EL_PINGUIN,                      GFX_PINGUIN             },
+    { EL_SCHWEIN,                      GFX_SCHWEIN             },
+    { EL_DRACHE,                       GFX_DRACHE              },
+    { EL_SONDE,                                GFX_SONDE               },
+    { EL_PFEIL_LEFT,                   GFX_PFEIL_LEFT          },
+    { EL_PFEIL_RIGHT,                  GFX_PFEIL_RIGHT         },
+    { EL_PFEIL_UP,                     GFX_PFEIL_UP            },
+    { EL_PFEIL_DOWN,                   GFX_PFEIL_DOWN          },
+    { EL_SPEED_PILL,                   GFX_SPEED_PILL          },
+    { EL_SP_TERMINAL_ACTIVE,           GFX_SP_TERMINAL         },
+    { EL_SP_BUG_ACTIVE,                        GFX_SP_BUG_ACTIVE       },
+    { EL_SP_ZONK,                      GFX_SP_ZONK             },
+    { EL_INVISIBLE_STEEL,              GFX_INVISIBLE_STEEL     },
+    { EL_BLACK_ORB,                    GFX_BLACK_ORB           },
+    { EL_EM_GATE_1,                    GFX_EM_GATE_1           },
+    { EL_EM_GATE_2,                    GFX_EM_GATE_2           },
+    { EL_EM_GATE_3,                    GFX_EM_GATE_3           },
+    { EL_EM_GATE_4,                    GFX_EM_GATE_4           },
+    { EL_EM_GATE_1X,                   GFX_EM_GATE_1X          },
+    { EL_EM_GATE_2X,                   GFX_EM_GATE_2X          },
+    { EL_EM_GATE_3X,                   GFX_EM_GATE_3X          },
+    { EL_EM_GATE_4X,                   GFX_EM_GATE_4X          },
+    { EL_EM_KEY_1_FILE,                        GFX_EM_KEY_1            },
+    { EL_EM_KEY_2_FILE,                        GFX_EM_KEY_2            },
+    { EL_EM_KEY_3_FILE,                        GFX_EM_KEY_3            },
+    { EL_EM_KEY_4_FILE,                        GFX_EM_KEY_4            },
+    { EL_EM_KEY_1,                     GFX_EM_KEY_1            },
+    { EL_EM_KEY_2,                     GFX_EM_KEY_2            },
+    { EL_EM_KEY_3,                     GFX_EM_KEY_3            },
+    { EL_EM_KEY_4,                     GFX_EM_KEY_4            },
+    { EL_PEARL,                                GFX_PEARL               },
+    { EL_CRYSTAL,                      GFX_CRYSTAL             },
+    { EL_WALL_PEARL,                   GFX_WALL_PEARL          },
+    { EL_WALL_CRYSTAL,                 GFX_WALL_CRYSTAL        },
+    { EL_DOOR_WHITE,                   GFX_DOOR_WHITE          },
+    { EL_DOOR_WHITE_GRAY,              GFX_DOOR_WHITE_GRAY     },
+    { EL_KEY_WHITE,                    GFX_KEY_WHITE           },
+    { EL_SHIELD_PASSIVE,               GFX_SHIELD_PASSIVE      },
+    { EL_SHIELD_ACTIVE,                        GFX_SHIELD_ACTIVE       },
+    { EL_EXTRA_TIME,                   GFX_EXTRA_TIME          },
+    { EL_SWITCHGATE_OPEN,              GFX_SWITCHGATE_OPEN     },
+    { EL_SWITCHGATE_CLOSED,            GFX_SWITCHGATE_CLOSED   },
+    { EL_SWITCHGATE_SWITCH_1,          GFX_SWITCHGATE_SWITCH_1 },
+    { EL_SWITCHGATE_SWITCH_2,          GFX_SWITCHGATE_SWITCH_2 },
+    { EL_BELT1_LEFT,                   GFX_BELT1_LEFT          },
+    { EL_BELT1_MIDDLE,                 GFX_BELT1_MIDDLE        },
+    { EL_BELT1_RIGHT,                  GFX_BELT1_RIGHT         },
+    { EL_BELT1_SWITCH_LEFT,            GFX_BELT1_SWITCH_LEFT   },
+    { EL_BELT1_SWITCH_MIDDLE,          GFX_BELT1_SWITCH_MIDDLE },
+    { EL_BELT1_SWITCH_RIGHT,           GFX_BELT1_SWITCH_RIGHT  },
+    { EL_BELT2_LEFT,                   GFX_BELT2_LEFT          },
+    { EL_BELT2_MIDDLE,                 GFX_BELT2_MIDDLE        },
+    { EL_BELT2_RIGHT,                  GFX_BELT2_RIGHT         },
+    { EL_BELT2_SWITCH_LEFT,            GFX_BELT2_SWITCH_LEFT   },
+    { EL_BELT2_SWITCH_MIDDLE,          GFX_BELT2_SWITCH_MIDDLE },
+    { EL_BELT2_SWITCH_RIGHT,           GFX_BELT2_SWITCH_RIGHT  },
+    { EL_BELT3_LEFT,                   GFX_BELT3_LEFT          },
+    { EL_BELT3_MIDDLE,                 GFX_BELT3_MIDDLE        },
+    { EL_BELT3_RIGHT,                  GFX_BELT3_RIGHT         },
+    { EL_BELT3_SWITCH_LEFT,            GFX_BELT3_SWITCH_LEFT   },
+    { EL_BELT3_SWITCH_MIDDLE,          GFX_BELT3_SWITCH_MIDDLE },
+    { EL_BELT3_SWITCH_RIGHT,           GFX_BELT3_SWITCH_RIGHT  },
+    { EL_BELT4_LEFT,                   GFX_BELT4_LEFT          },
+    { EL_BELT4_MIDDLE,                 GFX_BELT4_MIDDLE        },
+    { EL_BELT4_RIGHT,                  GFX_BELT4_RIGHT         },
+    { EL_BELT4_SWITCH_LEFT,            GFX_BELT4_SWITCH_LEFT   },
+    { EL_BELT4_SWITCH_MIDDLE,          GFX_BELT4_SWITCH_MIDDLE },
+    { EL_BELT4_SWITCH_RIGHT,           GFX_BELT4_SWITCH_RIGHT  },
+    { EL_LANDMINE,                     GFX_LANDMINE            },
+    { EL_ENVELOPE,                     GFX_ENVELOPE            },
+    { EL_LIGHT_SWITCH_OFF,             GFX_LIGHT_SWITCH_OFF    },
+    { EL_LIGHT_SWITCH_ON,              GFX_LIGHT_SWITCH_ON     },
+    { EL_SIGN_EXCLAMATION,             GFX_SIGN_EXCLAMATION    },
+    { EL_SIGN_RADIOACTIVITY,           GFX_SIGN_RADIOACTIVITY  },
+    { EL_SIGN_STOP,                    GFX_SIGN_STOP           },
+    { EL_SIGN_WHEELCHAIR,              GFX_SIGN_WHEELCHAIR     },
+    { EL_SIGN_PARKING,                 GFX_SIGN_PARKING        },
+    { EL_SIGN_ONEWAY,                  GFX_SIGN_ONEWAY         },
+    { EL_SIGN_HEART,                   GFX_SIGN_HEART          },
+    { EL_SIGN_TRIANGLE,                        GFX_SIGN_TRIANGLE       },
+    { EL_SIGN_ROUND,                   GFX_SIGN_ROUND          },
+    { EL_SIGN_EXIT,                    GFX_SIGN_EXIT           },
+    { EL_SIGN_YINYANG,                 GFX_SIGN_YINYANG        },
+    { EL_SIGN_OTHER,                   GFX_SIGN_OTHER          },
+    { EL_MOLE_LEFT,                    GFX_MOLE_LEFT           },
+    { EL_MOLE_RIGHT,                   GFX_MOLE_RIGHT          },
+    { EL_MOLE_UP,                      GFX_MOLE_UP             },
+    { EL_MOLE_DOWN,                    GFX_MOLE_DOWN           },
+    { EL_STEEL_SLANTED,                        GFX_STEEL_SLANTED       },
+    { EL_SAND_INVISIBLE,               GFX_SAND_INVISIBLE      },
+    { EL_DX_UNKNOWN_15,                        GFX_DX_UNKNOWN_15       },
+    { EL_DX_UNKNOWN_42,                        GFX_DX_UNKNOWN_42       },
+    { EL_TIMEGATE_OPEN,                        GFX_TIMEGATE_OPEN       },
+    { EL_TIMEGATE_CLOSED,              GFX_TIMEGATE_CLOSED     },
+    { EL_TIMEGATE_SWITCH_ON,           GFX_TIMEGATE_SWITCH     },
+    { EL_TIMEGATE_SWITCH_OFF,          GFX_TIMEGATE_SWITCH     },
+    { EL_BALLOON,                      GFX_BALLOON             },
+    { EL_BALLOON_SEND_LEFT,            GFX_BALLOON_SEND_LEFT   },
+    { EL_BALLOON_SEND_RIGHT,           GFX_BALLOON_SEND_RIGHT  },
+    { EL_BALLOON_SEND_UP,              GFX_BALLOON_SEND_UP     },
+    { EL_BALLOON_SEND_DOWN,            GFX_BALLOON_SEND_DOWN   },
+    { EL_BALLOON_SEND_ANY,             GFX_BALLOON_SEND_ANY    },
+    { EL_EMC_STEEL_WALL_1,             GFX_EMC_STEEL_WALL_1    },
+    { EL_EMC_STEEL_WALL_2,             GFX_EMC_STEEL_WALL_2    },
+    { EL_EMC_STEEL_WALL_3,             GFX_EMC_STEEL_WALL_3    },
+    { EL_EMC_STEEL_WALL_4,             GFX_EMC_STEEL_WALL_4    },
+    { EL_EMC_WALL_1,                   GFX_EMC_WALL_1          },
+    { EL_EMC_WALL_2,                   GFX_EMC_WALL_2          },
+    { EL_EMC_WALL_3,                   GFX_EMC_WALL_3          },
+    { EL_EMC_WALL_4,                   GFX_EMC_WALL_4          },
+    { EL_EMC_WALL_5,                   GFX_EMC_WALL_5          },
+    { EL_EMC_WALL_6,                   GFX_EMC_WALL_6          },
+    { EL_EMC_WALL_7,                   GFX_EMC_WALL_7          },
+    { EL_EMC_WALL_8,                   GFX_EMC_WALL_8          },
+    { EL_TUBE_CROSS,                   GFX_TUBE_CROSS          },
+    { EL_TUBE_VERTICAL,                        GFX_TUBE_VERTICAL       },
+    { EL_TUBE_HORIZONTAL,              GFX_TUBE_HORIZONTAL     },
+    { EL_TUBE_VERT_LEFT,               GFX_TUBE_VERT_LEFT      },
+    { EL_TUBE_VERT_RIGHT,              GFX_TUBE_VERT_RIGHT     },
+    { EL_TUBE_HORIZ_UP,                        GFX_TUBE_HORIZ_UP       },
+    { EL_TUBE_HORIZ_DOWN,              GFX_TUBE_HORIZ_DOWN     },
+    { EL_TUBE_LEFT_UP,                 GFX_TUBE_LEFT_UP        },
+    { EL_TUBE_LEFT_DOWN,               GFX_TUBE_LEFT_DOWN      },
+    { EL_TUBE_RIGHT_UP,                        GFX_TUBE_RIGHT_UP       },
+    { EL_TUBE_RIGHT_DOWN,              GFX_TUBE_RIGHT_DOWN     },
+    { EL_SPRING,                       GFX_SPRING              },
+    { EL_SPRING_MOVING,                        GFX_SPRING              },
+    { EL_TRAP_INACTIVE,                        GFX_TRAP_INACTIVE       },
+    { EL_TRAP_ACTIVE,                  GFX_TRAP_ACTIVE         },
+    { EL_BD_WALL,                      GFX_BD_WALL             },
+    { EL_BD_ROCK,                      GFX_BD_ROCK             },
+    { EL_DX_SUPABOMB,                  GFX_DX_SUPABOMB         },
+    { EL_SP_MURPHY_CLONE,              GFX_SP_MURPHY_CLONE     },
+    { -1,                              -1                      }
+  };
+
+  /* always start with reliable default values */
+  for(i=0; i<MAX_ELEMENTS; i++)
+    element_info[i].graphic = GFX_LEERRAUM;
+
+  for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
+    element_info[i].graphic = GFX_CHAR_START + (i - EL_CHAR_START);
+
+  for (i=EL_SP_START; i<=EL_SP_END; i++)
+  {
+    int nr_element = i - EL_SP_START;
+    int gfx_per_line = 8;
+    int nr_graphic =
+      (nr_element / gfx_per_line) * SP_PER_LINE +
+      (nr_element % gfx_per_line);
+
+    element_info[i].graphic = GFX_START_ROCKSSP + nr_graphic;
+  }
+
+  /* this overrides some of the above default settings (GFX_SP_ZONK etc.) */
+  i = 0;
+  while (element_to_graphic[i].element > -1)
+  {
+    int element = element_to_graphic[i].element;
+    int graphic = element_to_graphic[i].graphic;
+
+    element_info[element].graphic = graphic;
+    i++;
+  }
+}
+
+static void InitGraphicInfo()
+{
+  int i;
+
+  image_files = getCurrentImageList();
+
+  for(i=0; i<MAX_GRAPHICS; i++)
+  {
+    /* always start with reliable default values */
+    graphic_info[i].bitmap = NULL;
+    graphic_info[i].src_x = 0;
+    graphic_info[i].src_y = 0;
+
+    getGraphicSource(i, &graphic_info[i].bitmap,
+                    &graphic_info[i].src_x, &graphic_info[i].src_y);
+  }
+
+  for(i=0; i<NUM_IMAGE_FILES; i++)
+  {
+    int *parameter = image_files[i].parameter;
+
+    /* always start with reliable default values */
+    new_graphic_info[i].bitmap = getBitmapFromImageID(i);
+    new_graphic_info[i].src_x = parameter[GFXARG_XPOS] * TILEX;
+    new_graphic_info[i].src_y = parameter[GFXARG_YPOS] * TILEY;
+    new_graphic_info[i].anim_frames = parameter[GFXARG_FRAMES];
+    new_graphic_info[i].anim_delay = parameter[GFXARG_DELAY];
+    new_graphic_info[i].anim_vertical = parameter[GFXARG_VERTICAL];
+    new_graphic_info[i].anim_mode =
+      (parameter[GFXARG_PINGPONG] ? ANIM_PINGPONG :
+       parameter[GFXARG_REVERSE]  ? ANIM_REVERSE  : ANIM_NORMAL);
+
+    if (new_graphic_info[i].anim_delay == 0)   /* delay must be at least 1 */
+      new_graphic_info[i].anim_delay = 1;
+  }
+
+#if 0
+  printf("D> %d\n", image_files[GFX_BD_DIAMOND].parameter[GFXARG_NUM_FRAMES]);
+  printf("W> %d\n", image_files[GFX_ROBOT_WHEEL].parameter[GFXARG_NUM_FRAMES]);
+
+  graphic_info[GFX_ABLENK].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
+  graphic_info[GFX_ABLENK].src_x = 0;
+  graphic_info[GFX_ABLENK].src_y = 0;
+
+  graphic_info[GFX_ABLENK + 1].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
+  graphic_info[GFX_ABLENK + 2].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
+  graphic_info[GFX_ABLENK + 3].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
+  graphic_info[GFX_ABLENK + 1].src_x = 1 * TILEX;
+  graphic_info[GFX_ABLENK + 2].src_x = 2 * TILEX;
+  graphic_info[GFX_ABLENK + 3].src_x = 3 * TILEX;
+  graphic_info[GFX_ABLENK + 1].src_y = 0;
+  graphic_info[GFX_ABLENK + 2].src_y = 0;
+  graphic_info[GFX_ABLENK + 3].src_y = 0;
+#endif
+}
+
+static void InitSoundInfo()
+{
+  sound_files = getCurrentSoundList();
+
+  /* initialize sound effect lookup table for element actions */
+  InitGameSound();
+}
+
 void InitElementProperties()
 {
-  int i,j;
+  int i, j;
 
   static int ep_amoebalive[] =
   {
@@ -469,9 +973,13 @@ void InitElementProperties()
     EL_EM_GATE_3X,
     EL_EM_GATE_4X,
     EL_SWITCHGATE_OPEN,
+    EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
+    EL_SWITCHGATE_CLOSING,
     EL_TIMEGATE_OPEN,
+    EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
+    EL_TIMEGATE_CLOSING,
     EL_TUBE_CROSS,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
@@ -510,11 +1018,15 @@ void InitElementProperties()
     EL_QUICKSAND_EMPTYING,
     EL_MAGIC_WALL_OFF,
     EL_MAGIC_WALL_EMPTY,
+    EL_MAGIC_WALL_EMPTYING,
+    EL_MAGIC_WALL_FILLING,
     EL_MAGIC_WALL_FULL,
     EL_MAGIC_WALL_DEAD,
     EL_MAGIC_WALL_BD_OFF,
     EL_MAGIC_WALL_BD_EMPTY,
+    EL_MAGIC_WALL_BD_EMPTYING,
     EL_MAGIC_WALL_BD_FULL,
+    EL_MAGIC_WALL_BD_FILLING,
     EL_MAGIC_WALL_BD_DEAD,
     EL_LIFE,
     EL_LIFE_ASYNC,
@@ -540,6 +1052,7 @@ void InitElementProperties()
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
     EL_SP_TERMINAL,
+    EL_SP_TERMINAL_ACTIVE,
     EL_SP_EXIT,
     EL_INVISIBLE_STEEL,
     EL_BELT1_SWITCH_LEFT,
@@ -588,6 +1101,30 @@ void InitElementProperties()
     EL_CRYSTAL,
     EL_WALL_PEARL,
     EL_WALL_CRYSTAL,
+    EL_PFORTE1,
+    EL_PFORTE2,
+    EL_PFORTE3,
+    EL_PFORTE4,
+    EL_PFORTE1X,
+    EL_PFORTE2X,
+    EL_PFORTE3X,
+    EL_PFORTE4X,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1X,
+    EL_EM_GATE_2X,
+    EL_EM_GATE_3X,
+    EL_EM_GATE_4X,
+    EL_SWITCHGATE_OPEN,
+    EL_SWITCHGATE_OPENING,
+    EL_SWITCHGATE_CLOSED,
+    EL_SWITCHGATE_CLOSING,
+    EL_TIMEGATE_OPEN,
+    EL_TIMEGATE_OPENING,
+    EL_TIMEGATE_CLOSED,
+    EL_TIMEGATE_CLOSING,
     EL_TUBE_CROSS,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
@@ -611,26 +1148,6 @@ void InitElementProperties()
     EL_BADEWANNE3,
     EL_BADEWANNE4,
     EL_BADEWANNE5,
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1X,
-    EL_EM_GATE_2X,
-    EL_EM_GATE_3X,
-    EL_EM_GATE_4X,
-    EL_SWITCHGATE_OPEN,
-    EL_SWITCHGATE_CLOSED,
-    EL_TIMEGATE_OPEN,
-    EL_TIMEGATE_CLOSED,
     EL_SP_HARD_GRAY,
     EL_SP_HARD_GREEN,
     EL_SP_HARD_BLUE,
@@ -675,6 +1192,30 @@ void InitElementProperties()
     EL_EMC_STEEL_WALL_3,
     EL_EMC_STEEL_WALL_4,
     EL_CRYSTAL,
+    EL_PFORTE1,
+    EL_PFORTE2,
+    EL_PFORTE3,
+    EL_PFORTE4,
+    EL_PFORTE1X,
+    EL_PFORTE2X,
+    EL_PFORTE3X,
+    EL_PFORTE4X,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1X,
+    EL_EM_GATE_2X,
+    EL_EM_GATE_3X,
+    EL_EM_GATE_4X,
+    EL_SWITCHGATE_OPEN,
+    EL_SWITCHGATE_OPENING,
+    EL_SWITCHGATE_CLOSED,
+    EL_SWITCHGATE_CLOSING,
+    EL_TIMEGATE_OPEN,
+    EL_TIMEGATE_OPENING,
+    EL_TIMEGATE_CLOSED,
+    EL_TIMEGATE_CLOSING,
     EL_TUBE_CROSS,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
@@ -788,6 +1329,7 @@ void InitElementProperties()
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
     EL_SP_TERMINAL,
+    EL_SP_TERMINAL_ACTIVE,
     EL_SP_EXIT,
     EL_INVISIBLE_STEEL,
     EL_STEEL_SLANTED,
@@ -1563,19 +2105,73 @@ void InitElementProperties()
     Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
 }
 
+void Execute_Debug_Command(char *command)
+{
+  if (strcmp(command, "create 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));
+  }
+  else if (strcmp(command, "create soundsinfo.conf") == 0)
+  {
+    int i;
+
+    printf("# You can configure additional/alternative sound files here.\n");
+    printf("# (The sounds below are default and therefore commented out.)\n");
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("name", "Classic Sounds"));
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+    printf("\n");
+
+    for (i=0; sound_config[i].token != NULL; i++)
+      printf("# %s\n",
+            getFormattedSetupEntry(sound_config[i].token,
+                                   sound_config[i].value));
+  }
+  else if (strcmp(command, "create musicinfo.conf") == 0)
+  {
+    printf("# (Currently only \"name\" and \"sort_priority\" recognized.)\n");
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("name", "Classic Music"));
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+  }
+  else if (strcmp(command, "help") == 0)
+  {
+    printf("The following commands are recognized:\n");
+    printf("   \"create graphicsinfo.conf\"\n");
+    printf("   \"create soundsinfo.conf\"\n");
+    printf("   \"create musicinfo.conf\"\n");
+  }
+}
+
 void CloseAllAndExit(int exit_value)
 {
   int i;
 
   StopSounds();
-  FreeSounds(NUM_SOUNDS);
-  CloseAudio();
+  FreeAllSounds();
+  FreeAllMusic();
+  CloseAudio();                /* called after freeing sounds (needed for SDL) */
 
+  FreeAllImages();
+
+  FreeTileClipmasks();
   for(i=0; i<NUM_BITMAPS; i++)
-  {
-    FreeBitmap(pix_default[i]);
-    FreeBitmap(pix_custom[i]);
-  }
+    FreeBitmap(pix[i]);
 
   CloseVideoDisplay();
   ClosePlatformDependantStuff();