X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=bb5dd45075a1945b90d2acf65df2a00fbda6c391;hb=fffaec4e69e54c74cf5eea689191e81b8c19b85a;hp=08bbb05bdfe968f051c0a73041496c48d4c5bb0b;hpb=1465ca1ffdf2104d25b9a46ca9bf8a3f175403fd;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 08bbb05b..bb5dd450 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,18 +1,16 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2002 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  init.c                                                  *
+* init.c                                                   *
 ***********************************************************/
 
-#include <signal.h>
-
 #include "libgame/libgame.h"
 
 #include "init.h"
@@ -23,72 +21,105 @@
 #include "tape.h"
 #include "tools.h"
 #include "files.h"
-#include "joystick.h"
 #include "network.h"
 #include "netserv.h"
+#include "cartoons.h"
+#include "config.h"
 
-struct PictureFileInfo
+static char *image_filename[NUM_PICTURES] =
 {
-  char *picture_filename;
-  boolean picture_with_mask;
-};
-
+  "RocksScreen.pcx",
+  "RocksDoor.pcx",
+  "RocksHeroes.pcx",
+  "RocksToons.pcx",
+  "RocksSP.pcx",
+  "RocksDC.pcx",
+  "RocksMore.pcx",
+  "RocksFont.pcx",
+  "RocksFont2.pcx",
+  "RocksFont3.pcx"
+}; 
+
+static void InitSetup(void);
 static void InitPlayerInfo(void);
 static void InitLevelInfo(void);
+static void InitArtworkInfo(void);
+static void InitLevelArtworkInfo(void);
 static void InitNetworkServer(void);
+static void InitImages(void);
+static void InitMixer(void);
 static void InitSound(void);
-static void InitSoundServer(void);
-static void InitDisplay(void);
 static void InitGfx(void);
 static void InitGfxBackground(void);
-static void LoadGfx(int, struct PictureFileInfo *);
 static void InitGadgets(void);
 static void InitElementProperties(void);
+static void InitElementInfo(void);
+static void InitGraphicInfo(void);
+static void Execute_Debug_Command(char *);
 
-void OpenAll(int argc, char *argv[])
+void OpenAll(void)
 {
-#if !defined(PLATFORM_UNIX)
-  initErrorFile();
-#endif
+  if (options.debug_command)
+  {
+    Execute_Debug_Command(options.debug_command);
+
+    exit(0);
+  }
 
   if (options.serveronly)
   {
 #if defined(PLATFORM_UNIX)
     NetworkServer(options.server_port, options.serveronly);
 #else
-    Error(ERR_WARN, "networking not supported in Windows version");
+    Error(ERR_WARN, "networking only supported in Unix version");
 #endif
-
-    /* never reached */
-    exit(0);
+    exit(0);	/* never reached */
   }
 
+  InitProgramInfo(UNIX_USERDATA_DIRECTORY,
+		  PROGRAM_TITLE_STRING, getWindowTitleString(),
+		  ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME,
+		  MSDOS_POINTER_FILENAME,
+		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
+
+  InitSetup();
   InitPlayerInfo();
+  InitArtworkInfo();		/* needed before loading gfx, sound & music */
 
   InitCounter();
-  InitSound();
-  InitSoundServer();
+  InitMixer();
   InitJoysticks();
   InitRND(NEW_RANDOMIZE);
 
-  signal(SIGINT, CloseAllAndExit);
-  signal(SIGTERM, CloseAllAndExit);
+  InitVideoDisplay();
+  InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH,
+		  setup.fullscreen);
 
-  InitDisplay();
   InitEventFilter(FilterMouseMotionEvents);
 
   InitGfx();
   InitElementProperties();	/* initializes IS_CHAR() for el2gfx() */
+  InitElementInfo();
 
   InitLevelInfo();
+  InitLevelArtworkInfo();
   InitGadgets();		/* needs to know number of level series */
+  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;
@@ -97,14 +128,9 @@ void InitPlayerInfo()
   local_player = &stored_player[0];
 
   for (i=0; i<MAX_PLAYERS; i++)
-  {
-    stored_player[i].joystick_fd = -1;	/* joystick device closed */
     stored_player[i].connected = FALSE;
-  }
 
   local_player->connected = TRUE;
-
-  LoadSetup();					/* global setup info */
 }
 
 void InitLevelInfo()
@@ -114,6 +140,16 @@ void InitLevelInfo()
   LoadLevelSetup_SeriesInfo();			/* last played level info */
 }
 
+void InitArtworkInfo()
+{
+  LoadArtworkInfo();
+}
+
+void InitLevelArtworkInfo()
+{
+  LoadLevelArtworkInfo();
+}
+
 void InitNetworkServer()
 {
 #if defined(PLATFORM_UNIX)
@@ -137,236 +173,62 @@ void InitNetworkServer()
 #endif
 }
 
-void InitSound()
-{
-  int i;
-
-  OpenAudio(&audio);
-
-  for(i=0; i<NUM_SOUNDS; i++)
-  {
-    Sound[i].name = sound_name[i];
-
-    if (!LoadSound(&Sound[i]))
-    {
-      audio.sound_available = FALSE;
-      audio.loops_available = FALSE;
-      return;
-    }
-  }
-}
-
-void InitSoundServer()
+static void InitImages()
 {
-  if (!audio.sound_available)
-    return;
-
-#if !defined(TARGET_SDL)
-#if defined(PLATFORM_UNIX)
-
-  if (pipe(audio.soundserver_pipe) < 0)
+  static char *suffix_list[] =
   {
-    Error(ERR_WARN, "cannot create pipe - no sounds");
-    audio.sound_available = FALSE;
-    return;
-  }
-
-  if ((audio.soundserver_pid = fork()) < 0)
-  {       
-    Error(ERR_WARN, "cannot create sound server process - no sounds");
-    audio.sound_available = FALSE;
-    return;
-  }
-
-  if (audio.soundserver_pid == 0)	/* we are child */
-  {
-    SoundServer();
-
-    /* never reached */
-    exit(0);
-  }
-  else					/* we are parent */
-    close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
+    ".frame_xpos",
+    ".frame_ypos",
+    ".num_frames",
+    NULL
+  };
 
-#else /* !PLATFORM_UNIX */
+  image_files =
+    getFileListFromConfigList(image_config, suffix_list, NUM_IMAGE_FILES);
 
-  SoundServer();
+  InitImageList(image_files, NUM_IMAGE_FILES);
 
-#endif /* !PLATFORM_UNIX */
-#endif /* !TARGET_SDL */
+  /* load custom images */
+  ReloadCustomImages();
+  InitGraphicInfo();
 }
 
-void InitJoysticks()
+static void InitMixer()
 {
-#if defined(TARGET_SDL)
-  static boolean sdl_joystick_subsystem_initialized = FALSE;
-#endif
-
-  int i;
-
-  if (global_joystick_status == JOYSTICK_OFF)
-    return;
-
-  joystick_status = JOYSTICK_OFF;
-
-#if defined(TARGET_SDL)
-
-  if (!sdl_joystick_subsystem_initialized)
-  {
-    sdl_joystick_subsystem_initialized = TRUE;
-
-    if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
-    {
-      Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
-      return;
-    }
-  }
-
-  for (i=0; i<MAX_PLAYERS; i++)
-  {
-    char *device_name = setup.input[i].joy.device_name;
-    int joystick_nr = getJoystickNrFromDeviceName(device_name);
-
-    if (joystick_nr >= SDL_NumJoysticks())
-      joystick_nr = -1;
-
-    /* misuse joystick file descriptor variable to store joystick number */
-    stored_player[i].joystick_fd = joystick_nr;
-
-    /* this allows subsequent calls to 'InitJoysticks' for re-initialization */
-    if (Check_SDL_JoystickOpened(joystick_nr))
-      Close_SDL_Joystick(joystick_nr);
-
-    if (!setup.input[i].use_joystick)
-      continue;
-
-    if (!Open_SDL_Joystick(joystick_nr))
-    {
-      Error(ERR_WARN, "cannot open joystick %d", joystick_nr);
-      continue;
-    }
-
-    joystick_status = JOYSTICK_AVAILABLE;
-  }
-
-#else /* !TARGET_SDL */
-
-#if defined(PLATFORM_UNIX)
-  for (i=0; i<MAX_PLAYERS; i++)
+  static char *suffix_list[] =
   {
-    char *device_name = setup.input[i].joy.device_name;
-
-    /* this allows subsequent calls to 'InitJoysticks' for re-initialization */
-    if (stored_player[i].joystick_fd != -1)
-    {
-      close(stored_player[i].joystick_fd);
-      stored_player[i].joystick_fd = -1;
-    }
-
-    if (!setup.input[i].use_joystick)
-      continue;
-
-    if (access(device_name, R_OK) != 0)
-    {
-      Error(ERR_WARN, "cannot access joystick device '%s'", device_name);
-      continue;
-    }
-
-    if ((stored_player[i].joystick_fd = open(device_name, O_RDONLY)) < 0)
-    {
-      Error(ERR_WARN, "cannot open joystick device '%s'", device_name);
-      continue;
-    }
-
-    joystick_status = JOYSTICK_AVAILABLE;
-  }
-
-#else /* !PLATFORM_UNIX */
-
-  /* try to access two joysticks; if that fails, try to access just one */
-  if (install_joystick(JOY_TYPE_2PADS) == 0 ||
-      install_joystick(JOY_TYPE_AUTODETECT) == 0)
-    joystick_status = JOYSTICK_AVAILABLE;
+    NULL
+  };
 
-  /*
-  load_joystick_data(JOYSTICK_FILENAME);
-  */
+  OpenAudio();
 
-  for (i=0; i<MAX_PLAYERS; i++)
-  {
-    char *device_name = setup.input[i].joy.device_name;
-    int joystick_nr = getJoystickNrFromDeviceName(device_name);
+  sound_files =
+    getFileListFromConfigList(sound_config, suffix_list, NUM_SOUND_FILES);
 
-    if (joystick_nr >= num_joysticks)
-      joystick_nr = -1;
+  InitSoundList(sound_files, NUM_SOUND_FILES);
 
-    /* misuse joystick file descriptor variable to store joystick number */
-    stored_player[i].joystick_fd = joystick_nr;
-  }
-#endif
-
-#endif /* !TARGET_SDL */
+  StartMixer();
 }
 
-void InitDisplay()
+static void InitSound()
 {
-  char *gfx_dir = getPath2(options.ro_base_directory, GRAPHICS_DIRECTORY);
-  char *x11_icon_filename = getPath2(gfx_dir, X11_ICON_FILENAME);
-  char *x11_iconmask_filename = getPath2(gfx_dir, X11_ICONMASK_FILENAME);
-  char *msdos_pointer_filename = getPath2(gfx_dir, MSDOS_POINTER_FILENAME);
-
-  free(gfx_dir);
+  /* load custom sounds and music */
+  InitReloadSounds(artwork.snd_current->identifier);
+  InitReloadMusic(artwork.mus_current->identifier);
 
-  InitProgramInfo(program_name, PROGRAM_TITLE_STRING, WINDOW_TITLE_STRING,
-		  ICON_TITLE_STRING, x11_icon_filename, x11_iconmask_filename,
-		  msdos_pointer_filename);
-
-  InitVideoDisplay();
-  InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH,
-		  setup.fullscreen);
+  /* initialize sound effect lookup table for element actions */
+  InitGameSound();
 }
 
-void InitGfx()
+static void InitTileClipmasks()
 {
-  int i;
-
 #if defined(TARGET_X11)
-  GC copy_clipmask_gc;
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
-#endif
 
-#if !defined(PLATFORM_MSDOS)
-  static struct PictureFileInfo pic[NUM_PICTURES] =
-  {
-    { "RocksScreen",	TRUE },
-    { "RocksDoor",	TRUE },
-    { "RocksHeroes",	TRUE },
-    { "RocksToons",	TRUE },
-    { "RocksSP",	TRUE },
-    { "RocksDC",	TRUE },
-    { "RocksMore",	TRUE },
-    { "RocksFont",	FALSE },
-    { "RocksFont2",	FALSE },
-    { "RocksFont3",	FALSE }
-  }; 
-#else
-  static struct PictureFileInfo pic[NUM_PICTURES] =
-  {
-    { "Screen",	TRUE },
-    { "Door",	TRUE },
-    { "Heroes",	TRUE },
-    { "Toons",	TRUE },
-    { "SP",	TRUE },
-    { "DC",	TRUE },
-    { "More",	TRUE },
-    { "Font",	FALSE },
-    { "Font2",	FALSE },
-    { "Font3",	FALSE }
-  }; 
-#endif
+#if defined(TARGET_X11_NATIVE)
+  GC copy_clipmask_gc;
 
-#ifdef TARGET_X11
   static struct
   {
     int start;
@@ -418,94 +280,25 @@ void InitGfx()
     { GFX2_SHIELD_ACTIVE, 3 },
     { -1, 0 }
   };
-#endif
-
-  /* initialize playfield properties */
-
-  InitPlayfieldInfo(SX, SY, SXSIZE, SYSIZE,
-		    REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
-  InitDoor1Info(DX, DY, DXSIZE, DYSIZE);
-  InitDoor2Info(VX, VY, VXSIZE, VYSIZE);
-  InitScrollbufferInfo(FXSIZE, FYSIZE);
-
-  /* create additional image buffers for double-buffering */
-
-  pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
-  pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
-
-  LoadGfx(PIX_SMALLFONT, &pic[PIX_SMALLFONT]);
-  InitFontInfo(NULL, NULL, pix[PIX_SMALLFONT]);
+#endif /* TARGET_X11_NATIVE */
+#endif /* TARGET_X11 */
 
-  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);
-
-  for(i=0; i<NUM_PICTURES; i++)
-    if (i != PIX_SMALLFONT)
-      LoadGfx(i,&pic[i]);
-
-  InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]);
-
-  /* create additional image buffers for masking of graphics */
-
-#if defined(TARGET_SDL)
+  int i;
 
-#if 0
-  /* initialize surface array to 'NULL' */
+  /* initialize pixmap array for special X11 tile clipping to Pixmap 'None' */
   for(i=0; i<NUM_TILES; i++)
-    tile_masked[i] = NULL;
-
-  /* create only those masked surfaces we really need */
-  for(i=0; tile_needs_clipping[i].start>=0; i++)
-  {
-    for(j=0; j<tile_needs_clipping[i].count; j++)
-    {
-      SDL_Surface *sdl_image_tmp;
-      int tile = tile_needs_clipping[i].start + j;
-      int graphic = tile;
-      int src_x, src_y;
-      int bitmap_nr;
-      Bitmap src_bitmap;
-
-      getGraphicSource(graphic, &bitmap_nr, &src_x, &src_y);
-      src_bitmap = pix[bitmap_nr];
-
-      /* create surface for masked tile graphic */
-      if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE, TILEX, TILEY,
-						WIN_SDL_DEPTH, 0, 0, 0, 0))
-	  == NULL)
-	Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError());
-
-      /* create native transparent surface for current image */
-      SDL_SetColorKey(sdl_image_tmp, SDL_SRCCOLORKEY,
-		      SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00));
-      if ((tile_masked[tile] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
-	Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
-
-      SDL_FreeSurface(sdl_image_tmp);
-
-      BlitBitmap(src_bitmap, tile_masked[tile], src_x,src_y, TILEX,TILEY, 0,0);
-    }
-  }
-#endif
-
-#else /* !TARGET_SDL */
+    tile_clipmask[i] = None;
 
-  /* 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);
+#if defined(TARGET_X11)
+  /* This stuff is needed because X11 (XSetClipOrigin(), to be precise) is
+     often very slow when preparing a masked XCopyArea() for big Pixmaps.
+     To prevent this, create small (tile-sized) mask Pixmaps which will then
+     be set much faster with XSetClipOrigin() and speed things up a lot. */
 
   clip_gc_values.graphics_exposures = False;
   clip_gc_valuemask = GCGraphicsExposures;
-  tile_clip_gc =
-    XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
+  tile_clip_gc = XCreateGC(display, window->drawable,
+			   clip_gc_valuemask, &clip_gc_values);
 
   for(i=0; i<NUM_BITMAPS; i++)
   {
@@ -515,13 +308,17 @@ void InitGfx()
       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);
     }
   }
 
-  /* initialize pixmap array to Pixmap 'None' */
-  for(i=0; i<NUM_TILES; i++)
-    tile_clipmask[i] = None;
+#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++)
@@ -533,11 +330,11 @@ void InitGfx()
       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);
@@ -547,7 +344,83 @@ void InitGfx()
     }
   }
 
-#endif /* !TARGET_SDL */
+  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()
+{
+  int i;
+
+  /* initialize some global variables */
+  global.frames_per_second = 0;
+  global.fps_slowdown = FALSE;
+  global.fps_slowdown_factor = 1;
+
+  /* initialize screen properties */
+  InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE,
+		   REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
+  InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE);
+  InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE);
+  InitGfxScrollbufferInfo(FXSIZE, FYSIZE);
+
+  /* create additional image buffers for double-buffering */
+  pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
+  pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
+
+  pix[PIX_SMALLFONT] = LoadCustomImage(image_filename[PIX_SMALLFONT]);
+
+  InitFontInfo(NULL, NULL, pix[PIX_SMALLFONT]);
+
+  DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
+  DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
+
+  DrawInitText("Loading graphics:", 120, FC_GREEN);
+
+  for(i=0; i<NUM_PICTURES; i++)
+  {
+    if (i != PIX_SMALLFONT)
+    {
+      DrawInitText(image_filename[i], 150, FC_YELLOW);
+
+      pix[i] = LoadCustomImage(image_filename[i]);
+    }
+  }
+
+  InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]);
+
+  InitTileClipmasks();
 }
 
 void InitGfxBackground()
@@ -558,9 +431,9 @@ void InitGfxBackground()
   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);
+  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++)
@@ -569,89 +442,121 @@ void InitGfxBackground()
   redraw_mask = REDRAW_ALL;
 }
 
-void LoadGfx(int pos, struct PictureFileInfo *pic)
+void ReloadCustomArtwork()
 {
-  char basefilename[256];
-  char filename[256];
-
-#if defined(TARGET_SDL)
-  SDL_Surface *sdl_image_tmp;
-#else
-  int pcx_err;
-#endif
-  char *picture_ext = ".pcx";
+  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;
 
-  /* Grafik laden */
-  if (pic->picture_filename)
-  {
-    sprintf(basefilename, "%s%s", pic->picture_filename, picture_ext);
-    DrawInitText(basefilename, 150, FC_YELLOW);
-    sprintf(filename, "%s/%s/%s",
-	    options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename);
+  /* 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 defined(PLATFORM_MSDOS)
-    rest(100);
+#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
 
-    pix[pos] = CreateBitmapStruct();
+  /* leveldir_current may be invalid (level group, parent link) */
+  if (!validLevelSeries(leveldir_current))
+    return;
 
-#if defined(TARGET_SDL)
-    /* load image to temporary surface */
-    if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
-      Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError());
+#if 0
+  printf("--> '%s'\n", artwork.gfx_current_identifier);
+#endif
 
-    /* create native non-transparent surface for current image */
-    if ((pix[pos]->surface = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
-      Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
+  /* 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;
+  }
 
-    /* create native transparent surface for current image */
-    SDL_SetColorKey(sdl_image_tmp, SDL_SRCCOLORKEY,
-		    SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00));
-    if ((pix[pos]->surface_masked = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
-      Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
+  /* 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;
 
-    /* free temporary surface */
-    SDL_FreeSurface(sdl_image_tmp);
+    setLevelArtworkDir(artwork.gfx_first);
 
-#else /* !TARGET_SDL */
+    ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
-    pcx_err = Read_PCX_to_Pixmap(display, window->drawable, window->gc,
-				 filename,
-				 &pix[pos]->drawable, &pix[pos]->clip_mask);
-    switch(pcx_err)
+    for(i=0; i<NUM_PICTURES; i++)
     {
-      case PCX_Success:
-        break;
-      case PCX_OpenFailed:
-        Error(ERR_EXIT, "cannot open PCX file '%s'", filename);
-      case PCX_ReadFailed:
-        Error(ERR_EXIT, "cannot read PCX file '%s'", filename);
-      case PCX_FileInvalid:
-	Error(ERR_EXIT, "invalid PCX file '%s'", filename);
-      case PCX_NoMemory:
-	Error(ERR_EXIT, "not enough memory for PCX file '%s'", filename);
-      case PCX_ColorFailed:
-	Error(ERR_EXIT, "cannot get colors for PCX file '%s'", filename);
-      default:
-	break;
+      DrawInitText(image_filename[i], 150, FC_YELLOW);
+      ReloadCustomImage(pix[i], image_filename[i]);
     }
 
-    if (!pix[pos]->drawable)
-      Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename);
+    ReloadCustomImages();
+    InitGraphicInfo();
 
-#if 0
-    /* setting pix_masked[] to pix[] allows BlitBitmapMasked() to always
-       use pix_masked[], although they are the same when not using SDL */
-    pix_masked[pos] = pix[pos];
-#endif
+    FreeTileClipmasks();
+    InitTileClipmasks();
+    InitGfxBackground();
+
+    /* force redraw of (open or closed) door graphics */
+    SetDoorState(DOOR_OPEN_ALL);
+    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
 
-#endif /* !TARGET_SDL */
+    artwork.gfx_current_identifier = gfx_new_identifier;
+    last_override_level_graphics = setup.override_level_graphics;
   }
 
-#if defined(TARGET_X11)
-  /* check if clip mask was correctly created */
-  if (pic->picture_with_mask && !pix[pos]->clip_mask)
-    Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
+  if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 ||
+      last_override_level_sounds != setup.override_level_sounds)
+  {
+    /* set artwork path to send it to the sound server process */
+    setLevelArtworkDir(artwork.snd_first);
+
+    InitReloadSounds(snd_new_identifier);
+
+    artwork.snd_current_identifier = snd_new_identifier;
+    last_override_level_sounds = setup.override_level_sounds;
+  }
+
+  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
 }
 
@@ -664,9 +569,328 @@ 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++;
+  }
+}
+
+void InitGraphicInfo()
+{
+  int i;
+
+  /* always start with reliable default values */
+  for(i=0; i<MAX_GRAPHICS; i++)
+  {
+    graphic_info[i].bitmap = NULL;
+    graphic_info[i].src_x = 0;
+    graphic_info[i].src_y = 0;
+    graphic_info[i].anim_frames = 1;
+    graphic_info[i].anim_delay = 0;
+    graphic_info[i].anim_mode = ANIM_NORMAL;
+
+    getGraphicSource(i, &graphic_info[i].bitmap,
+		     &graphic_info[i].src_x, &graphic_info[i].src_y);
+  }
+}
+
 void InitElementProperties()
 {
-  int i,j;
+  int i, j;
 
   static int ep_amoebalive[] =
   {
@@ -675,7 +899,7 @@ void InitElementProperties()
     EL_AMOEBE_VOLL,
     EL_AMOEBE_BD
   };
-  static int ep_amoebalive_num = sizeof(ep_amoebalive)/sizeof(int);
+  static int ep_amoebalive_num = SIZEOF_ARRAY_INT(ep_amoebalive);
 
   static int ep_amoeboid[] =
   {
@@ -685,7 +909,7 @@ void InitElementProperties()
     EL_AMOEBE_VOLL,
     EL_AMOEBE_BD
   };
-  static int ep_amoeboid_num = sizeof(ep_amoeboid)/sizeof(int);
+  static int ep_amoeboid_num = SIZEOF_ARRAY_INT(ep_amoeboid);
 
   static int ep_schluessel[] =
   {
@@ -698,7 +922,7 @@ void InitElementProperties()
     EL_EM_KEY_3,
     EL_EM_KEY_4
   };
-  static int ep_schluessel_num = sizeof(ep_schluessel)/sizeof(int);
+  static int ep_schluessel_num = SIZEOF_ARRAY_INT(ep_schluessel);
 
   static int ep_pforte[] =
   {
@@ -719,9 +943,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,
@@ -734,7 +962,7 @@ void InitElementProperties()
     EL_TUBE_RIGHT_UP,
     EL_TUBE_RIGHT_DOWN
   };
-  static int ep_pforte_num = sizeof(ep_pforte)/sizeof(int);
+  static int ep_pforte_num = SIZEOF_ARRAY_INT(ep_pforte);
 
   static int ep_solid[] =
   {
@@ -756,13 +984,19 @@ void InitElementProperties()
     EL_AMOEBE_BD,
     EL_MORAST_VOLL,
     EL_MORAST_LEER,
+    EL_QUICKSAND_FILLING,
+    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,
@@ -788,6 +1022,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,
@@ -836,6 +1071,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,
@@ -848,7 +1107,7 @@ void InitElementProperties()
     EL_TUBE_RIGHT_UP,
     EL_TUBE_RIGHT_DOWN
   };
-  static int ep_solid_num = sizeof(ep_solid)/sizeof(int);
+  static int ep_solid_num = SIZEOF_ARRAY_INT(ep_solid);
 
   static int ep_massive[] =
   {
@@ -859,26 +1118,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,
@@ -923,6 +1162,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,
@@ -935,7 +1198,7 @@ void InitElementProperties()
     EL_TUBE_RIGHT_UP,
     EL_TUBE_RIGHT_DOWN
   };
-  static int ep_massive_num = sizeof(ep_massive)/sizeof(int);
+  static int ep_massive_num = SIZEOF_ARRAY_INT(ep_massive);
 
   static int ep_slippery[] =
   {
@@ -972,7 +1235,7 @@ void InitElementProperties()
     EL_PEARL,
     EL_CRYSTAL
   };
-  static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
+  static int ep_slippery_num = SIZEOF_ARRAY_INT(ep_slippery);
 
   static int ep_enemy[] =
   {
@@ -987,7 +1250,7 @@ void InitElementProperties()
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON
   };
-  static int ep_enemy_num = sizeof(ep_enemy)/sizeof(int);
+  static int ep_enemy_num = SIZEOF_ARRAY_INT(ep_enemy);
 
   static int ep_mauer[] =
   {
@@ -1036,6 +1299,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,
@@ -1052,7 +1316,7 @@ void InitElementProperties()
     EL_EMC_WALL_7,
     EL_EMC_WALL_8
   };
-  static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int);
+  static int ep_mauer_num = SIZEOF_ARRAY_INT(ep_mauer);
 
   static int ep_can_fall[] =
   {
@@ -1080,7 +1344,7 @@ void InitElementProperties()
     EL_SPRING,
     EL_DX_SUPABOMB
   };
-  static int ep_can_fall_num = sizeof(ep_can_fall)/sizeof(int);
+  static int ep_can_fall_num = SIZEOF_ARRAY_INT(ep_can_fall);
 
   static int ep_can_smash[] =
   {
@@ -1113,7 +1377,7 @@ void InitElementProperties()
     EL_SPRING,
     EL_DX_SUPABOMB
   };
-  static int ep_can_smash_num = sizeof(ep_can_smash)/sizeof(int);
+  static int ep_can_smash_num = SIZEOF_ARRAY_INT(ep_can_smash);
 
   static int ep_can_change[] =
   {
@@ -1126,7 +1390,7 @@ void InitElementProperties()
     EL_EDELSTEIN_LILA,
     EL_DIAMANT
   };
-  static int ep_can_change_num = sizeof(ep_can_change)/sizeof(int);
+  static int ep_can_change_num = SIZEOF_ARRAY_INT(ep_can_change);
 
   static int ep_can_move[] =
   {
@@ -1148,7 +1412,7 @@ void InitElementProperties()
     EL_BALLOON,
     EL_SPRING_MOVING
   };
-  static int ep_can_move_num = sizeof(ep_can_move)/sizeof(int);
+  static int ep_can_move_num = SIZEOF_ARRAY_INT(ep_can_move);
 
   static int ep_could_move[] =
   {
@@ -1173,7 +1437,7 @@ void InitElementProperties()
     EL_PACMAN_LEFT,
     EL_PACMAN_DOWN
   };
-  static int ep_could_move_num = sizeof(ep_could_move)/sizeof(int);
+  static int ep_could_move_num = SIZEOF_ARRAY_INT(ep_could_move);
 
   static int ep_dont_touch[] =
   {
@@ -1182,7 +1446,7 @@ void InitElementProperties()
     EL_BUTTERFLY,
     EL_FIREFLY
   };
-  static int ep_dont_touch_num = sizeof(ep_dont_touch)/sizeof(int);
+  static int ep_dont_touch_num = SIZEOF_ARRAY_INT(ep_dont_touch);
 
   static int ep_dont_go_to[] =
   {
@@ -1202,7 +1466,7 @@ void InitElementProperties()
     EL_TRAP_ACTIVE,
     EL_LANDMINE
   };
-  static int ep_dont_go_to_num = sizeof(ep_dont_go_to)/sizeof(int);
+  static int ep_dont_go_to_num = SIZEOF_ARRAY_INT(ep_dont_go_to);
 
   static int ep_mampf2[] =
   {
@@ -1229,7 +1493,7 @@ void InitElementProperties()
     EL_PEARL,
     EL_CRYSTAL
   };
-  static int ep_mampf2_num = sizeof(ep_mampf2)/sizeof(int);
+  static int ep_mampf2_num = SIZEOF_ARRAY_INT(ep_mampf2);
 
   static int ep_bd_element[] =
   {
@@ -1258,7 +1522,7 @@ void InitElementProperties()
     EL_AMOEBE_BD,
     EL_CHAR_FRAGE
   };
-  static int ep_bd_element_num = sizeof(ep_bd_element)/sizeof(int);
+  static int ep_bd_element_num = SIZEOF_ARRAY_INT(ep_bd_element);
 
   static int ep_sb_element[] =
   {
@@ -1270,7 +1534,7 @@ void InitElementProperties()
     EL_SPIELFIGUR,
     EL_INVISIBLE_STEEL
   };
-  static int ep_sb_element_num = sizeof(ep_sb_element)/sizeof(int);
+  static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element);
 
   static int ep_gem[] =
   {
@@ -1279,10 +1543,9 @@ void InitElementProperties()
     EL_EDELSTEIN_GELB,
     EL_EDELSTEIN_ROT,
     EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
-    EL_SP_INFOTRON
+    EL_DIAMANT
   };
-  static int ep_gem_num = sizeof(ep_gem)/sizeof(int);
+  static int ep_gem_num = SIZEOF_ARRAY_INT(ep_gem);
 
   static int ep_inactive[] =
   {
@@ -1419,7 +1682,7 @@ void InitElementProperties()
     EL_EMC_WALL_7,
     EL_EMC_WALL_8
   };
-  static int ep_inactive_num = sizeof(ep_inactive)/sizeof(int);
+  static int ep_inactive_num = SIZEOF_ARRAY_INT(ep_inactive);
 
   static int ep_explosive[] =
   {
@@ -1446,7 +1709,7 @@ void InitElementProperties()
     EL_SP_ELECTRON,
     EL_DX_SUPABOMB
   };
-  static int ep_explosive_num = sizeof(ep_explosive)/sizeof(int);
+  static int ep_explosive_num = SIZEOF_ARRAY_INT(ep_explosive);
 
   static int ep_mampf3[] =
   {
@@ -1459,7 +1722,7 @@ void InitElementProperties()
     EL_PEARL,
     EL_CRYSTAL
   };
-  static int ep_mampf3_num = sizeof(ep_mampf3)/sizeof(int);
+  static int ep_mampf3_num = SIZEOF_ARRAY_INT(ep_mampf3);
 
   static int ep_pushable[] =
   {
@@ -1478,7 +1741,7 @@ void InitElementProperties()
     EL_SPRING,
     EL_DX_SUPABOMB
   };
-  static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int);
+  static int ep_pushable_num = SIZEOF_ARRAY_INT(ep_pushable);
 
   static int ep_player[] =
   {
@@ -1488,7 +1751,7 @@ void InitElementProperties()
     EL_SPIELER3,
     EL_SPIELER4
   };
-  static int ep_player_num = sizeof(ep_player)/sizeof(int);
+  static int ep_player_num = SIZEOF_ARRAY_INT(ep_player);
 
   static int ep_has_content[] =
   {
@@ -1498,7 +1761,7 @@ void InitElementProperties()
     EL_AMOEBE_VOLL,
     EL_AMOEBE_BD
   };
-  static int ep_has_content_num = sizeof(ep_has_content)/sizeof(int);
+  static int ep_has_content_num = SIZEOF_ARRAY_INT(ep_has_content);
 
   static int ep_eatable[] =
   {
@@ -1508,7 +1771,7 @@ void InitElementProperties()
     EL_TRAP_INACTIVE,
     EL_SAND_INVISIBLE
   };
-  static int ep_eatable_num = sizeof(ep_eatable)/sizeof(int);
+  static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable);
 
   static int ep_sp_element[] =
   {
@@ -1557,7 +1820,7 @@ void InitElementProperties()
     /* more than one murphy in a level results in an inactive clone */
     EL_SP_MURPHY_CLONE
   };
-  static int ep_sp_element_num = sizeof(ep_sp_element)/sizeof(int);
+  static int ep_sp_element_num = SIZEOF_ARRAY_INT(ep_sp_element);
 
   static int ep_quick_gate[] =
   {
@@ -1583,7 +1846,7 @@ void InitElementProperties()
     EL_SWITCHGATE_OPEN,
     EL_TIMEGATE_OPEN
   };
-  static int ep_quick_gate_num = sizeof(ep_quick_gate)/sizeof(int);
+  static int ep_quick_gate_num = SIZEOF_ARRAY_INT(ep_quick_gate);
 
   static int ep_over_player[] =
   {
@@ -1610,7 +1873,7 @@ void InitElementProperties()
     EL_TUBE_RIGHT_UP,
     EL_TUBE_RIGHT_DOWN
   };
-  static int ep_over_player_num = sizeof(ep_over_player)/sizeof(int);
+  static int ep_over_player_num = SIZEOF_ARRAY_INT(ep_over_player);
 
   static int ep_active_bomb[] =
   {
@@ -1620,7 +1883,7 @@ void InitElementProperties()
     EL_DYNABOMB_ACTIVE_3,
     EL_DYNABOMB_ACTIVE_4
   };
-  static int ep_active_bomb_num = sizeof(ep_active_bomb)/sizeof(int);
+  static int ep_active_bomb_num = SIZEOF_ARRAY_INT(ep_active_bomb);
 
   static int ep_belt[] =
   {
@@ -1637,7 +1900,7 @@ void InitElementProperties()
     EL_BELT4_MIDDLE,
     EL_BELT4_RIGHT,
   };
-  static int ep_belt_num = sizeof(ep_belt)/sizeof(int);
+  static int ep_belt_num = SIZEOF_ARRAY_INT(ep_belt);
 
   static int ep_belt_switch[] =
   {
@@ -1654,7 +1917,7 @@ void InitElementProperties()
     EL_BELT4_SWITCH_MIDDLE,
     EL_BELT4_SWITCH_RIGHT,
   };
-  static int ep_belt_switch_num = sizeof(ep_belt_switch)/sizeof(int);
+  static int ep_belt_switch_num = SIZEOF_ARRAY_INT(ep_belt_switch);
 
   static int ep_tube[] =
   {
@@ -1670,7 +1933,7 @@ void InitElementProperties()
     EL_TUBE_RIGHT_UP,
     EL_TUBE_RIGHT_DOWN
   };
-  static int ep_tube_num = sizeof(ep_tube)/sizeof(int);
+  static int ep_tube_num = SIZEOF_ARRAY_INT(ep_tube);
 
   static long ep1_bit[] =
   {
@@ -1792,8 +2055,8 @@ void InitElementProperties()
     &ep_belt_switch_num,
     &ep_tube_num
   };
-  static int num_properties1 = sizeof(ep1_num)/sizeof(int *);
-  static int num_properties2 = sizeof(ep2_num)/sizeof(int *);
+  static int num_properties1 = SIZEOF_ARRAY(ep1_num, int *);
+  static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *);
 
   for(i=0; i<MAX_ELEMENTS; i++)
   {
@@ -1812,44 +2075,76 @@ 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;
 
-#if defined(TARGET_SDL)
   StopSounds();
-  FreeSounds(NUM_SOUNDS);
-#else
-  if (audio.soundserver_pid)
-  {
-    StopSounds();
-    kill(audio.soundserver_pid, SIGTERM);
-    FreeSounds(NUM_SOUNDS);
-  }
-#endif
+  FreeAllSounds();
+  FreeAllMusic();
+  CloseAudio();		/* called after freeing sounds (needed for SDL) */
 
+  FreeAllImages();
+
+  FreeTileClipmasks();
   for(i=0; i<NUM_BITMAPS; i++)
     FreeBitmap(pix[i]);
 
-#if defined(TARGET_SDL)
-  KeyboardAutoRepeatOn();
-#else
-
-#if 0
-  if (gc)
-    XFreeGC(display, gc);
-#endif
-
-  if (display)
-  {
-    KeyboardAutoRepeatOn();
-    XCloseDisplay(display);
-  }
-#endif
-
-#if !defined(PLATFORM_UNIX)
-  dumpErrorFile();
-#endif
+  CloseVideoDisplay();
+  ClosePlatformDependantStuff();
 
   exit(exit_value);
 }