X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=8393c629d76d5c7adbb5540dbb9cd0942fd16ddd;hb=e788c9b6a44d9f2dea7aa048b48a11b14761229e;hp=3e98c552d03ea72f4d3ea73a77ce096f1e97f535;hpb=a35852e106072656e444202e672d050ebff03abb;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 3e98c552..8393c629 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,99 +1,119 @@
 /***********************************************************
-*  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-2001 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  init.c                                                  *
+* init.c                                                   *
 ***********************************************************/
 
-#include <signal.h>
+#include "libgame/libgame.h"
 
 #include "init.h"
-#include "misc.h"
-#include "sound.h"
+#include "events.h"
 #include "screens.h"
 #include "editor.h"
 #include "game.h"
 #include "tape.h"
 #include "tools.h"
 #include "files.h"
-#include "joystick.h"
-#include "image.h"
-#include "pcx.h"
 #include "network.h"
 #include "netserv.h"
+#include "cartoons.h"
+#include "config.h"
 
-struct PictureFileInfo
+static char *image_filename[NUM_PICTURES] =
 {
-  char *picture_filename;
-  boolean picture_with_mask;
-};
-
-struct IconFileInfo
-{
-  char *picture_filename;
-  char *picturemask_filename;
-};
-
-static int sound_process_id = 0;
-
-static void InitLevelAndPlayerInfo(void);
+  "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 InitNetworkServer(void);
-static void InitDisplay(void);
+static void InitMixer(void);
 static void InitSound(void);
-static void InitSoundServer(void);
-static void InitWindow(int, char **);
 static void InitGfx(void);
-static void LoadGfx(int, struct PictureFileInfo *);
+static void InitGfxBackground(void);
 static void InitGadgets(void);
 static void InitElementProperties(void);
+static void Execute_Debug_Command(char *);
 
-void OpenAll(int argc, char *argv[])
+void OpenAll(void)
 {
-#ifdef MSDOS
-  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);
-
-    /* never reached */
-    exit(0);
+#else
+    Error(ERR_WARN, "networking only supported in Unix version");
+#endif
+    exit(0);	/* never reached */
   }
 
+  InitProgramInfo(UNIX_USERDATA_DIRECTORY,
+		  PROGRAM_TITLE_STRING, getWindowTitleString(),
+		  ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME,
+		  MSDOS_POINTER_FILENAME,
+		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
+
+  InitSetup();
+  InitPlayerInfo();
+  InitArtworkInfo();		/* needed before loading gfx, sound & music */
+
   InitCounter();
-  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();
-  InitWindow(argc, argv);
-
-  XMapWindow(display, window);
-  XFlush(display);
+  InitEventFilter(FilterMouseMotionEvents);
 
   InitGfx();
   InitElementProperties();	/* initializes IS_CHAR() for el2gfx() */
 
-  InitLevelAndPlayerInfo();
+  InitLevelInfo();
   InitGadgets();		/* needs to know number of level series */
+  InitSound();			/* needs to know current level directory */
+
+  InitGfxBackground();
+  InitToons();
 
   DrawMainMenu();
 
   InitNetworkServer();
 }
 
-void InitLevelAndPlayerInfo()
+void InitSetup()
+{
+  LoadSetup();					/* global setup info */
+}
+
+void InitPlayerInfo()
 {
   int i;
 
@@ -101,29 +121,33 @@ void InitLevelAndPlayerInfo()
   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;
+}
 
+void InitLevelInfo()
+{
   LoadLevelInfo();				/* global level info */
-  LoadSetup();					/* global setup info */
   LoadLevelSetup_LastSeries();			/* last played series info */
-  LoadLevelSetup_SeriesInfo(leveldir_nr);	/* last played level info */
+  LoadLevelSetup_SeriesInfo();			/* last played level info */
+}
+
+void InitArtworkInfo()
+{
+  LoadArtworkInfo();
 }
 
 void InitNetworkServer()
 {
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
   int nr_wanted;
 #endif
 
   if (!options.network)
     return;
 
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
   nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
 
   if (!ConnectToServer(options.server_host, options.server_port))
@@ -137,380 +161,28 @@ void InitNetworkServer()
 #endif
 }
 
-void InitSound()
+static void InitMixer()
 {
-  int i;
+  OpenAudio();
+  InitSoundList(sound_effects, NUM_SOUND_EFFECTS);
 
-  if (sound_status == SOUND_OFF)
-    return;
-
-#ifndef MSDOS
-  if (access(sound_device_name, W_OK) != 0)
-  {
-    Error(ERR_WARN, "cannot access sound device - no sounds");
-    sound_status = SOUND_OFF;
-    return;
-  }
-
-  if ((sound_device = open(sound_device_name,O_WRONLY))<0)
-  {
-    Error(ERR_WARN, "cannot open sound device - no sounds");
-    sound_status = SOUND_OFF;
-    return;
-  }
-
-  close(sound_device);
-  sound_status = SOUND_AVAILABLE;
-
-#ifdef VOXWARE
-  sound_loops_allowed = TRUE;
-
-  /*
-  setup.sound_loops_on = TRUE;
-  */
-
-#endif
-#else /* MSDOS */
-  sound_loops_allowed = TRUE;
-
-  /*
-  setup.sound_loops_on = TRUE;
-  */
-
-#endif /* MSDOS */
-
-  for(i=0; i<NUM_SOUNDS; i++)
-  {
-#ifdef MSDOS
-    sprintf(sound_name[i], "%d", i + 1);
-#endif
-
-    Sound[i].name = sound_name[i];
-    if (!LoadSound(&Sound[i]))
-    {
-      sound_status = SOUND_OFF;
-      return;
-    }
-  }
+  StartMixer();
 }
 
-void InitSoundServer()
+static void InitSound()
 {
-  if (sound_status == SOUND_OFF)
-    return;
-
-#ifndef MSDOS
-
-  if (pipe(sound_pipe)<0)
-  {
-    Error(ERR_WARN, "cannot create pipe - no sounds");
-    sound_status = SOUND_OFF;
-    return;
-  }
-
-  if ((sound_process_id = fork()) < 0)
-  {       
-    Error(ERR_WARN, "cannot create sound server process - no sounds");
-    sound_status = SOUND_OFF;
-    return;
-  }
-
-  if (!sound_process_id)	/* we are child */
-  {
-    SoundServer();
-
-    /* never reached */
-    exit(0);
-  }
-  else				/* we are parent */
-    close(sound_pipe[0]);	/* no reading from pipe needed */
-
-#else /* MSDOS */
-
-  SoundServer();
-
-#endif /* MSDOS */
-}
-
-void InitJoysticks()
-{
-  int i;
-
-  if (global_joystick_status == JOYSTICK_OFF)
-    return;
-
-  joystick_status = JOYSTICK_OFF;
-
-#ifndef MSDOS
-  for (i=0; i<MAX_PLAYERS; i++)
-  {
-    char *device_name = setup.input[i].joy.device_name;
-
-    /* this allows subsequent calls to 'InitJoysticks' for re-initialization */
-    if (stored_player[i].joystick_fd != -1)
-    {
-      close(stored_player[i].joystick_fd);
-      stored_player[i].joystick_fd = -1;
-    }
-
-    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 /* MSDOS */
-
-  /* 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;
-
-  /*
-  load_joystick_data(JOYSTICK_FILENAME);
-  */
-
-  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 >= num_joysticks)
-      joystick_nr = -1;
-
-    /* misuse joystick file descriptor variable to store joystick number */
-    stored_player[i].joystick_fd = joystick_nr;
-  }
-#endif
-}
-
-void InitDisplay()
-{
-#ifndef MSDOS
-  XVisualInfo vinfo_template, *vinfo;
-  int num_visuals;
-#endif
-  unsigned int depth;
-
-  /* connect to X server */
-  if (!(display = XOpenDisplay(options.display_name)))
-    Error(ERR_EXIT, "cannot connect to X server %s",
-	  XDisplayName(options.display_name));
-
-  screen = DefaultScreen(display);
-  visual = DefaultVisual(display, screen);
-  depth  = DefaultDepth(display, screen);
-  cmap   = DefaultColormap(display, screen);
-
-#ifndef MSDOS
-  /* look for good enough visual */
-  vinfo_template.screen = screen;
-  vinfo_template.class = (depth == 8 ? PseudoColor : TrueColor);
-  vinfo_template.depth = depth;
-  if ((vinfo = XGetVisualInfo(display, VisualScreenMask | VisualClassMask |
-			      VisualDepthMask, &vinfo_template, &num_visuals)))
-  {
-    visual = vinfo->visual;
-    XFree((void *)vinfo);
-  }
-
-  /* got appropriate visual? */
-  if (depth < 8)
-  {
-    printf("Sorry, displays with less than 8 bits per pixel not supported.\n");
-    exit(-1);
-  }
-  else if ((depth ==8 && visual->class != PseudoColor) ||
-	   (depth > 8 && visual->class != TrueColor &&
-	    visual->class != DirectColor))
-  {
-    printf("Sorry, cannot get appropriate visual.\n");
-    exit(-1);
-  }
-#endif
-}
-
-void InitWindow(int argc, char *argv[])
-{
-  unsigned int border_width = 4;
-  XGCValues gc_values;
-  unsigned long gc_valuemask;
-#ifndef MSDOS
-  XTextProperty windowName, iconName;
-  Pixmap icon_pixmap, iconmask_pixmap;
-  unsigned int icon_width, icon_height;
-  int icon_hot_x, icon_hot_y;
-  char icon_filename[256];
-  XSizeHints size_hints;
-  XWMHints wm_hints;
-  XClassHint class_hints;
-  char *window_name = WINDOW_TITLE_STRING;
-  char *icon_name = WINDOW_TITLE_STRING;
-  long window_event_mask;
-  Atom proto_atom = None, delete_atom = None;
-#endif
-  int screen_width, screen_height;
-  int win_xpos = WIN_XPOS, win_ypos = WIN_YPOS;
-  unsigned long pen_fg = WhitePixel(display,screen);
-  unsigned long pen_bg = BlackPixel(display,screen);
-  const int width = WIN_XSIZE, height = WIN_YSIZE;
-
-#ifndef MSDOS
-  static struct IconFileInfo icon_pic =
-  {
-    "rocks_icon.xbm",
-    "rocks_iconmask.xbm"
-  };
-#endif
-
-  screen_width = XDisplayWidth(display, screen);
-  screen_height = XDisplayHeight(display, screen);
-
-  win_xpos = (screen_width - width) / 2;
-  win_ypos = (screen_height - height) / 2;
-
-  window = XCreateSimpleWindow(display, RootWindow(display, screen),
-			       win_xpos, win_ypos, width, height, border_width,
-			       pen_fg, pen_bg);
-
-#ifndef MSDOS
-  proto_atom = XInternAtom(display, "WM_PROTOCOLS", FALSE);
-  delete_atom = XInternAtom(display, "WM_DELETE_WINDOW", FALSE);
-  if ((proto_atom != None) && (delete_atom != None))
-    XChangeProperty(display, window, proto_atom, XA_ATOM, 32,
-		    PropModePrepend, (unsigned char *) &delete_atom, 1);
-
-  sprintf(icon_filename, "%s/%s/%s",
-	  options.ro_base_directory, GRAPHICS_DIRECTORY,
-	  icon_pic.picture_filename);
-  XReadBitmapFile(display,window,icon_filename,
-		  &icon_width,&icon_height,
-		  &icon_pixmap,&icon_hot_x,&icon_hot_y);
-  if (!icon_pixmap)
-    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
-
-  sprintf(icon_filename, "%s/%s/%s",
-	  options.ro_base_directory, GRAPHICS_DIRECTORY,
-	  icon_pic.picturemask_filename);
-  XReadBitmapFile(display,window,icon_filename,
-		  &icon_width,&icon_height,
-		  &iconmask_pixmap,&icon_hot_x,&icon_hot_y);
-  if (!iconmask_pixmap)
-    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
-
-  size_hints.width  = size_hints.min_width  = size_hints.max_width  = width;
-  size_hints.height = size_hints.min_height = size_hints.max_height = height;
-  size_hints.flags = PSize | PMinSize | PMaxSize;
-
-  if (win_xpos || win_ypos)
-  {
-    size_hints.x = win_xpos;
-    size_hints.y = win_ypos;
-    size_hints.flags |= PPosition;
-  }
-
-  if (!XStringListToTextProperty(&window_name, 1, &windowName))
-    Error(ERR_EXIT, "structure allocation for windowName failed");
-
-  if (!XStringListToTextProperty(&icon_name, 1, &iconName))
-    Error(ERR_EXIT, "structure allocation for iconName failed");
-
-  wm_hints.initial_state = NormalState;
-  wm_hints.input = True;
-  wm_hints.icon_pixmap = icon_pixmap;
-  wm_hints.icon_mask = iconmask_pixmap;
-  wm_hints.flags = StateHint | IconPixmapHint | IconMaskHint | InputHint;
-
-  class_hints.res_name = program_name;
-  class_hints.res_class = "Rocks'n'Diamonds";
-
-  XSetWMProperties(display, window, &windowName, &iconName, 
-		   argv, argc, &size_hints, &wm_hints, 
-		   &class_hints);
-
-  XFree(windowName.value);
-  XFree(iconName.value);
-
-  /* Select event types wanted */
-  window_event_mask =
-    ExposureMask | StructureNotifyMask | FocusChangeMask |
-    ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
-    PointerMotionHintMask | KeyPressMask | KeyReleaseMask;
-
-  XSelectInput(display, window, window_event_mask);
-#endif
-
-  /* create GC for drawing with window depth */
-  gc_values.graphics_exposures = False;
-  gc_values.foreground = pen_bg;
-  gc_values.background = pen_bg;
-  gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground;
-  gc = XCreateGC(display, window, gc_valuemask, &gc_values);
+  InitReloadSounds(artwork.snd_current->name);
+  InitReloadMusic(artwork.mus_current->name);
 }
 
-void InitGfx()
+static void InitTileClipmasks()
 {
-  int i,j;
-  GC copy_clipmask_gc;
+#if defined(TARGET_X11)
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
 
-#ifdef MSDOS
-  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 }
-  }; 
-#else
-  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 }
-  }; 
-#endif
-
-#ifdef DEBUG
-#if 0
-  static struct PictureFileInfo test_pic1 =
-  {
-    "RocksFont2",
-    FALSE
-  };
-  static struct PictureFileInfo test_pic2 =
-  {
-    "mouse",
-    FALSE
-  };
-#endif
-#endif
+#if defined(TARGET_X11_NATIVE)
+  GC copy_clipmask_gc;
 
   static struct
   {
@@ -563,68 +235,52 @@ void InitGfx()
     { GFX2_SHIELD_ACTIVE, 3 },
     { -1, 0 }
   };
+#endif /* TARGET_X11_NATIVE */
+#endif /* TARGET_X11 */
 
-#if DEBUG_TIMING
-  debug_print_timestamp(0, NULL);	/* initialize timestamp function */
-#endif
-
-#ifdef DEBUG
-#if 0
-  printf("Test: Loading RocksFont2.pcx ...\n");
-  LoadGfx(PIX_SMALLFONT,&test_pic1);
-  printf("Test: Done.\n");
-  printf("Test: Loading mouse.pcx ...\n");
-  LoadGfx(PIX_SMALLFONT,&test_pic2);
-  printf("Test: Done.\n");
-#endif
-#endif
-
+  int i;
 
+  /* initialize pixmap array for special X11 tile clipping to Pixmap 'None' */
+  for(i=0; i<NUM_TILES; i++)
+    tile_clipmask[i] = None;
 
-  LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]);
-  DrawInitText(WINDOW_TITLE_STRING,20,FC_YELLOW);
-  DrawInitText(COPYRIGHT_STRING,50,FC_RED);
-#ifdef MSDOS
-  DrawInitText("MSDOS version done by Guido Schulz",210,FC_BLUE);
-  rest(200);
-#endif /* MSDOS */
-  DrawInitText("Loading graphics:",120,FC_GREEN);
+#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. */
 
-  for(i=0; i<NUM_PICTURES; i++)
-    if (i != PIX_SMALLFONT)
-      LoadGfx(i,&pic[i]);
+  clip_gc_values.graphics_exposures = False;
+  clip_gc_valuemask = GCGraphicsExposures;
+  tile_clip_gc =
+    XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
 
-#if DEBUG_TIMING
-  debug_print_timestamp(0, "SUMMARY LOADING ALL GRAPHICS:");
-#endif
+  for(i=0; i<NUM_BITMAPS; i++)
+  {
+    if (pix[i]->clip_mask)
+    {
+      clip_gc_values.graphics_exposures = False;
+      clip_gc_values.clip_mask = pix[i]->clip_mask;
+      clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
+      pix[i]->stored_clip_gc = XCreateGC(display, window->drawable,
+					 clip_gc_valuemask, &clip_gc_values);
+    }
+  }
 
-  pix[PIX_DB_BACK] = XCreatePixmap(display, window,
-				   WIN_XSIZE,WIN_YSIZE,
-				   XDefaultDepth(display,screen));
-  pix[PIX_DB_DOOR] = XCreatePixmap(display, window,
-				   3*DXSIZE,DYSIZE+VYSIZE,
-				   XDefaultDepth(display,screen));
-  pix[PIX_DB_FIELD] = XCreatePixmap(display, window,
-				    FXSIZE,FYSIZE,
-				    XDefaultDepth(display,screen));
+#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,clipmask[PIX_BACK],clip_gc_valuemask,&clip_gc_values);
-
-  clip_gc_values.graphics_exposures = False;
-  clip_gc_valuemask = GCGraphicsExposures;
-  tile_clip_gc =
-    XCreateGC(display,window,clip_gc_valuemask,&clip_gc_values);
-
-  /* initialize pixmap array to Pixmap 'None' */
-  for(i=0; i<NUM_TILES; i++)
-    tile_clipmask[i] = None;
+    XCreateGC(display, pix[PIX_BACK]->clip_mask,
+	      clip_gc_valuemask, &clip_gc_values);
 
   /* create only those clipping Pixmaps we really need */
   for(i=0; tile_needs_clipping[i].start>=0; i++)
   {
+    int j;
+
     for(j=0; j<tile_needs_clipping[i].count; j++)
     {
       int tile = tile_needs_clipping[i].start + j;
@@ -634,178 +290,149 @@ void InitGfx()
       Pixmap src_pixmap;
 
       getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
-      src_pixmap = clipmask[pixmap_nr];
+      src_pixmap = pix[pixmap_nr]->clip_mask;
 
-      tile_clipmask[tile] = XCreatePixmap(display, window, TILEX,TILEY, 1);
+      tile_clipmask[tile] = XCreatePixmap(display, window->drawable,
+					  TILEX, TILEY, 1);
 
-      XCopyArea(display,src_pixmap,tile_clipmask[tile],copy_clipmask_gc,
-		src_x,src_y, TILEX,TILEY, 0,0);
+      XCopyArea(display, src_pixmap, tile_clipmask[tile], copy_clipmask_gc,
+		src_x, src_y, TILEX, TILEY, 0, 0);
     }
   }
 
-  if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR])
-    Error(ERR_EXIT, "cannot create additional pixmaps");
+  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_PIXMAPS; i++)
+  for(i=0; i<NUM_TILES; i++)
   {
-    if (clipmask[i])
+    if (tile_clipmask[i] != None)
     {
-      clip_gc_values.graphics_exposures = False;
-      clip_gc_values.clip_mask = clipmask[i];
-      clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
-      clip_gc[i] = XCreateGC(display,window,clip_gc_valuemask,&clip_gc_values);
+      XFreePixmap(display, tile_clipmask[i]);
+      tile_clipmask[i] = None;
     }
   }
 
-  drawto = backbuffer = pix[PIX_DB_BACK];
-  fieldbuffer = pix[PIX_DB_FIELD];
-  SetDrawtoField(DRAW_BACKBUFFER);
-
-  XCopyArea(display,pix[PIX_BACK],backbuffer,gc,
-	    0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
-  XFillRectangle(display,pix[PIX_DB_BACK],gc,
-		 REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
-  XFillRectangle(display,pix[PIX_DB_DOOR],gc,
-		 0,0, 3*DXSIZE,DYSIZE+VYSIZE);
+  if (tile_clip_gc)
+    XFreeGC(display, tile_clip_gc);
+  tile_clip_gc = None;
 
-  for(i=0; i<MAX_BUF_XSIZE; i++)
-    for(j=0; j<MAX_BUF_YSIZE; j++)
-      redraw[i][j] = 0;
-  redraw_tiles = 0;
-  redraw_mask = REDRAW_ALL;
+  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 LoadGfx(int pos, struct PictureFileInfo *pic)
+void InitGfx()
 {
-  char basefilename[256];
-  char filename[256];
-
-#ifdef USE_XPM_LIBRARY
-  int xpm_err, xbm_err;
-  unsigned int width,height;
-  int hot_x,hot_y;
-  Pixmap shapemask;
-  char *picture_ext = ".xpm";
-  char *picturemask_ext = "Mask.xbm";
-#else
-  int pcx_err;
-  char *picture_ext = ".pcx";
-#endif
+  int i;
 
-  /* 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);
+  /* initialize some global variables */
+  global.frames_per_second = 0;
+  global.fps_slowdown = FALSE;
+  global.fps_slowdown_factor = 1;
 
-#ifdef MSDOS
-    rest(100);
-#endif /* MSDOS */
+  /* 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);
 
-#if DEBUG_TIMING
-    debug_print_timestamp(1, NULL);	/* initialize timestamp function */
-#endif
+  /* 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);
 
-#ifdef USE_XPM_LIBRARY
+  pix[PIX_SMALLFONT] = LoadCustomImage(image_filename[PIX_SMALLFONT]);
 
-    xpm_att[pos].valuemask = XpmCloseness;
-    xpm_att[pos].closeness = 20000;
-    xpm_err = XpmReadFileToPixmap(display,window,filename,
-				  &pix[pos],&shapemask,&xpm_att[pos]);
-    switch(xpm_err)
-    {
-      case XpmOpenFailed:
-	Error(ERR_EXIT, "cannot open XPM file '%s'", filename);
-      case XpmFileInvalid:
-	Error(ERR_EXIT, "invalid XPM file '%s'", filename);
-      case XpmNoMemory:
-	Error(ERR_EXIT, "not enough memory for XPM file '%s'", filename);
-      case XpmColorFailed:
-	Error(ERR_EXIT, "cannot get colors for XPM file '%s'", filename);
-      default:
-	break;
-    }
+  InitFontInfo(NULL, NULL, pix[PIX_SMALLFONT]);
 
-#if DEBUG_TIMING
-    printf("LOADING XPM FILE %s:", filename);
-    debug_print_timestamp(1, "");
-#endif
+  DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
+  DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
 
-#else /* !USE_XPM_LIBRARY */
+  DrawInitText("Loading graphics:", 120, FC_GREEN);
 
-    pcx_err = Read_PCX_to_Pixmap(display, window, gc, filename,
-				 &pix[pos], &clipmask[pos]);
-    switch(pcx_err)
+  for(i=0; i<NUM_PICTURES; i++)
+  {
+    if (i != PIX_SMALLFONT)
     {
-      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);
+
+      pix[i] = LoadCustomImage(image_filename[i]);
     }
+  }
 
-#if DEBUG_TIMING
-    printf("SUMMARY LOADING PCX FILE %s:", filename);
-    debug_print_timestamp(1, "");
-#endif
+  InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]);
 
-#endif /* !USE_XPM_LIBRARY */
+  InitTileClipmasks();
+}
 
-    if (!pix[pos])
-      Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename);
-  }
+void InitGfxBackground()
+{
+  int x, y;
 
-  /* zugehörige Maske laden (wenn vorhanden) */
-  if (pic->picture_with_mask)
-  {
-#ifdef USE_XPM_LIBRARY
+  drawto = backbuffer;
+  fieldbuffer = pix[PIX_DB_FIELD];
+  SetDrawtoField(DRAW_BACKBUFFER);
 
-    sprintf(basefilename, "%s%s", pic->picture_filename, picturemask_ext);
-    DrawInitText(basefilename, 150, FC_YELLOW);
-    sprintf(filename, "%s/%s/%s",
-	    options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename);
+  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);
 
-#if DEBUG_TIMING
-    debug_print_timestamp(1, NULL);	/* initialize timestamp function */
-#endif
+  for(x=0; x<MAX_BUF_XSIZE; x++)
+    for(y=0; y<MAX_BUF_YSIZE; y++)
+      redraw[x][y] = 0;
+  redraw_tiles = 0;
+  redraw_mask = REDRAW_ALL;
+}
+
+void ReloadCustomArtwork()
+{
+  if (artwork.graphics_set_current != artwork.gfx_current->name)
+  {
+    int i;
+
+    ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
-    xbm_err = XReadBitmapFile(display,window,filename,
-			      &width,&height,&clipmask[pos],&hot_x,&hot_y);
-    switch(xbm_err)
+    for(i=0; i<NUM_PICTURES; i++)
     {
-      case BitmapSuccess:
-        break;
-      case BitmapOpenFailed:
-	Error(ERR_EXIT, "cannot open XBM file '%s'", filename);
-      case BitmapFileInvalid:
-	Error(ERR_EXIT, "invalid XBM file '%s'", filename);
-      case BitmapNoMemory:
-	Error(ERR_EXIT, "not enough memory for XBM file '%s'", filename);
-	break;
-      default:
-	break;
+      DrawInitText(image_filename[i], 150, FC_YELLOW);
+      ReloadCustomImage(pix[i], image_filename[i]);
     }
 
-#if DEBUG_TIMING
-    printf("LOADING XBM FILE %s:", filename);
-    debug_print_timestamp(1, "");
-#endif
+    FreeTileClipmasks();
+    InitTileClipmasks();
+    InitGfxBackground();
+
+    SetDoorState(DOOR_OPEN_1 | DOOR_CLOSE_2);
 
-#endif /* USE_XPM_LIBRARY */
+    artwork.graphics_set_current = artwork.gfx_current->name;
+  }
+
+  if (artwork.sounds_set_current != artwork.snd_current->name)
+  {
+    InitReloadSounds(artwork.snd_current->name);
+
+    artwork.sounds_set_current = artwork.snd_current->name;
+  }
+
+  if (artwork.music_set_current != artwork.mus_current->name)
+  {
+    InitReloadMusic(artwork.mus_current->name);
 
-    if (!clipmask[pos])
-      Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
+    artwork.music_set_current = artwork.mus_current->name;
   }
 }
 
@@ -829,7 +456,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[] =
   {
@@ -839,7 +466,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[] =
   {
@@ -852,7 +479,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[] =
   {
@@ -875,9 +502,20 @@ void InitElementProperties()
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_CLOSED,
     EL_TIMEGATE_OPEN,
-    EL_TIMEGATE_CLOSED
+    EL_TIMEGATE_CLOSED,
+    EL_TUBE_CROSS,
+    EL_TUBE_VERTICAL,
+    EL_TUBE_HORIZONTAL,
+    EL_TUBE_VERT_LEFT,
+    EL_TUBE_VERT_RIGHT,
+    EL_TUBE_HORIZ_UP,
+    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_LEFT_UP,
+    EL_TUBE_LEFT_DOWN,
+    EL_TUBE_RIGHT_UP,
+    EL_TUBE_RIGHT_DOWN
   };
-  static int ep_pforte_num = sizeof(ep_pforte)/sizeof(int);
+  static int ep_pforte_num = SIZEOF_ARRAY_INT(ep_pforte);
 
   static int ep_solid[] =
   {
@@ -887,6 +525,7 @@ void InitElementProperties()
     EL_MAUER_X,
     EL_MAUER_Y,
     EL_MAUER_XY,
+    EL_BD_WALL,
     EL_FELSBODEN,
     EL_AUSGANG_ZU,
     EL_AUSGANG_ACT,
@@ -898,14 +537,16 @@ void InitElementProperties()
     EL_AMOEBE_BD,
     EL_MORAST_VOLL,
     EL_MORAST_LEER,
-    EL_SIEB_INAKTIV,
-    EL_SIEB_LEER,
-    EL_SIEB_VOLL,
-    EL_SIEB_TOT,
-    EL_SIEB2_INAKTIV,
-    EL_SIEB2_LEER,
-    EL_SIEB2_VOLL,
-    EL_SIEB2_TOT,
+    EL_QUICKSAND_FILLING,
+    EL_QUICKSAND_EMPTYING,
+    EL_MAGIC_WALL_OFF,
+    EL_MAGIC_WALL_EMPTY,
+    EL_MAGIC_WALL_FULL,
+    EL_MAGIC_WALL_DEAD,
+    EL_MAGIC_WALL_BD_OFF,
+    EL_MAGIC_WALL_BD_EMPTY,
+    EL_MAGIC_WALL_BD_FULL,
+    EL_MAGIC_WALL_BD_DEAD,
     EL_LIFE,
     EL_LIFE_ASYNC,
     EL_BADEWANNE1,
@@ -974,9 +615,23 @@ void InitElementProperties()
     EL_EMC_WALL_5,
     EL_EMC_WALL_6,
     EL_EMC_WALL_7,
-    EL_EMC_WALL_8
+    EL_EMC_WALL_8,
+    EL_CRYSTAL,
+    EL_WALL_PEARL,
+    EL_WALL_CRYSTAL,
+    EL_TUBE_CROSS,
+    EL_TUBE_VERTICAL,
+    EL_TUBE_HORIZONTAL,
+    EL_TUBE_VERT_LEFT,
+    EL_TUBE_VERT_RIGHT,
+    EL_TUBE_HORIZ_UP,
+    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_LEFT_UP,
+    EL_TUBE_LEFT_DOWN,
+    EL_TUBE_RIGHT_UP,
+    EL_TUBE_RIGHT_DOWN
   };
-  static int ep_solid_num = sizeof(ep_solid)/sizeof(int);
+  static int ep_solid_num = SIZEOF_ARRAY_INT(ep_solid);
 
   static int ep_massive[] =
   {
@@ -1049,14 +704,28 @@ void InitElementProperties()
     EL_EMC_STEEL_WALL_1,
     EL_EMC_STEEL_WALL_2,
     EL_EMC_STEEL_WALL_3,
-    EL_EMC_STEEL_WALL_4
+    EL_EMC_STEEL_WALL_4,
+    EL_CRYSTAL,
+    EL_TUBE_CROSS,
+    EL_TUBE_VERTICAL,
+    EL_TUBE_HORIZONTAL,
+    EL_TUBE_VERT_LEFT,
+    EL_TUBE_VERT_RIGHT,
+    EL_TUBE_HORIZ_UP,
+    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_LEFT_UP,
+    EL_TUBE_LEFT_DOWN,
+    EL_TUBE_RIGHT_UP,
+    EL_TUBE_RIGHT_DOWN
   };
-  static int ep_massive_num = sizeof(ep_massive)/sizeof(int);
+  static int ep_massive_num = SIZEOF_ARRAY_INT(ep_massive);
 
   static int ep_slippery[] =
   {
     EL_FELSBODEN,
+    EL_BD_WALL,
     EL_FELSBROCKEN,
+    EL_BD_ROCK,
     EL_EDELSTEIN,
     EL_EDELSTEIN_BD,
     EL_EDELSTEIN_GELB,
@@ -1082,9 +751,11 @@ void InitElementProperties()
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
     EL_SPEED_PILL,
-    EL_STEEL_SLANTED
+    EL_STEEL_SLANTED,
+    EL_PEARL,
+    EL_CRYSTAL
   };
-  static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
+  static int ep_slippery_num = SIZEOF_ARRAY_INT(ep_slippery);
 
   static int ep_enemy[] =
   {
@@ -1099,7 +770,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[] =
   {
@@ -1130,6 +801,7 @@ void InitElementProperties()
     EL_MAUER_Y,
     EL_MAUER_XY,
     EL_MAUERND,
+    EL_BD_WALL,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
@@ -1163,11 +835,12 @@ 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[] =
   {
     EL_FELSBROCKEN,
+    EL_BD_ROCK,
     EL_EDELSTEIN,
     EL_EDELSTEIN_BD,
     EL_EDELSTEIN_GELB,
@@ -1178,19 +851,24 @@ void InitElementProperties()
     EL_KOKOSNUSS,
     EL_TROPFEN,
     EL_MORAST_VOLL,
-    EL_SIEB_VOLL,
-    EL_SIEB2_VOLL,
+    EL_MAGIC_WALL_FULL,
+    EL_MAGIC_WALL_BD_FULL,
     EL_ZEIT_VOLL,
     EL_ZEIT_LEER,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
-    EL_SP_DISK_ORANGE
+    EL_SP_DISK_ORANGE,
+    EL_PEARL,
+    EL_CRYSTAL,
+    EL_SPRING,
+    EL_DX_SUPABOMB
   };
-  static int ep_can_fall_num = sizeof(ep_can_fall)/sizeof(int);
+  static int ep_can_fall_num = SIZEOF_ARRAY_INT(ep_can_fall);
 
   static int ep_can_smash[] =
   {
     EL_FELSBROCKEN,
+    EL_BD_ROCK,
     EL_EDELSTEIN,
     EL_EDELSTEIN_BD,
     EL_EDELSTEIN_GELB,
@@ -1212,13 +890,18 @@ void InitElementProperties()
     EL_ZEIT_LEER,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
-    EL_SP_DISK_ORANGE
+    EL_SP_DISK_ORANGE,
+    EL_PEARL,
+    EL_CRYSTAL,
+    EL_SPRING,
+    EL_DX_SUPABOMB
   };
-  static int ep_can_smash_num = sizeof(ep_can_smash)/sizeof(int);
+  static int ep_can_smash_num = SIZEOF_ARRAY_INT(ep_can_smash);
 
   static int ep_can_change[] =
   {
     EL_FELSBROCKEN,
+    EL_BD_ROCK,
     EL_EDELSTEIN,
     EL_EDELSTEIN_BD,
     EL_EDELSTEIN_GELB,
@@ -1226,7 +909,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[] =
   {
@@ -1245,9 +928,10 @@ void InitElementProperties()
     EL_SONDE,
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
-    EL_BALLOON
+    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[] =
   {
@@ -1272,7 +956,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[] =
   {
@@ -1281,7 +965,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[] =
   {
@@ -1298,9 +982,10 @@ void InitElementProperties()
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
     EL_SP_BUG_ACTIVE,
+    EL_TRAP_ACTIVE,
     EL_LANDMINE
   };
-  static int ep_dont_go_to_num = sizeof(ep_dont_go_to)/sizeof(int);
+  static int ep_dont_go_to_num = SIZEOF_ARRAY_INT(ep_dont_go_to);
 
   static int ep_mampf2[] =
   {
@@ -1323,18 +1008,22 @@ void InitElementProperties()
     EL_EDELSTEIN_GELB,
     EL_EDELSTEIN_ROT,
     EL_EDELSTEIN_LILA,
-    EL_DIAMANT
+    EL_DIAMANT,
+    EL_PEARL,
+    EL_CRYSTAL
   };
-  static int ep_mampf2_num = sizeof(ep_mampf2)/sizeof(int);
+  static int ep_mampf2_num = SIZEOF_ARRAY_INT(ep_mampf2);
 
   static int ep_bd_element[] =
   {
     EL_LEERRAUM,
     EL_ERDREICH,
     EL_FELSBODEN,
+    EL_BD_WALL,
     EL_FELSBROCKEN,
+    EL_BD_ROCK,
     EL_EDELSTEIN_BD,
-    EL_SIEB2_INAKTIV,
+    EL_MAGIC_WALL_BD_OFF,
     EL_AUSGANG_ZU,
     EL_AUSGANG_AUF,
     EL_BETON,
@@ -1352,7 +1041,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[] =
   {
@@ -1364,7 +1053,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[] =
   {
@@ -1373,16 +1062,16 @@ 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[] =
   {
     EL_LEERRAUM,
     EL_ERDREICH,
     EL_MAUERWERK,
+    EL_BD_WALL,
     EL_FELSBODEN,
     EL_SCHLUESSEL,
     EL_BETON,
@@ -1435,10 +1124,10 @@ void InitElementProperties()
     EL_BADEWANNE3,
     EL_BADEWANNE4,
     EL_BADEWANNE5,
-    EL_SIEB_INAKTIV,
-    EL_SIEB_TOT,
-    EL_SIEB2_INAKTIV,
-    EL_SIEB2_TOT,
+    EL_MAGIC_WALL_OFF,
+    EL_MAGIC_WALL_DEAD,
+    EL_MAGIC_WALL_BD_OFF,
+    EL_MAGIC_WALL_BD_DEAD,
     EL_AMOEBA2DIAM,
     EL_BLOCKED,
     EL_SP_EMPTY,
@@ -1512,7 +1201,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[] =
   {
@@ -1536,9 +1225,10 @@ void InitElementProperties()
     EL_SP_DISK_ORANGE,
     EL_SP_DISK_YELLOW,
     EL_SP_SNIKSNAK,
-    EL_SP_ELECTRON
+    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[] =
   {
@@ -1547,13 +1237,16 @@ void InitElementProperties()
     EL_EDELSTEIN_GELB,
     EL_EDELSTEIN_ROT,
     EL_EDELSTEIN_LILA,
-    EL_DIAMANT
+    EL_DIAMANT,
+    EL_PEARL,
+    EL_CRYSTAL
   };
-  static int ep_mampf3_num = sizeof(ep_mampf3)/sizeof(int);
+  static int ep_mampf3_num = SIZEOF_ARRAY_INT(ep_mampf3);
 
   static int ep_pushable[] =
   {
     EL_FELSBROCKEN,
+    EL_BD_ROCK,
     EL_BOMBE,
     EL_KOKOSNUSS,
     EL_ZEIT_LEER,
@@ -1563,9 +1256,11 @@ void InitElementProperties()
     EL_SP_ZONK,
     EL_SP_DISK_ORANGE,
     EL_SP_DISK_YELLOW,
-    EL_BALLOON
+    EL_BALLOON,
+    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[] =
   {
@@ -1575,7 +1270,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[] =
   {
@@ -1585,16 +1280,17 @@ 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[] =
   {
     EL_ERDREICH,
     EL_SP_BASE,
     EL_SP_BUG,
+    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[] =
   {
@@ -1639,9 +1335,11 @@ void InitElementProperties()
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
     /* additional elements that appeared in newer Supaplex levels */
-    EL_UNSICHTBAR
+    EL_UNSICHTBAR,
+    /* 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[] =
   {
@@ -1667,7 +1365,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[] =
   {
@@ -1681,9 +1379,20 @@ void InitElementProperties()
     EL_SP_PORT2_DOWN,
     EL_SP_PORT_X,
     EL_SP_PORT_Y,
-    EL_SP_PORT_XY
+    EL_SP_PORT_XY,
+    EL_TUBE_CROSS,
+    EL_TUBE_VERTICAL,
+    EL_TUBE_HORIZONTAL,
+    EL_TUBE_VERT_LEFT,
+    EL_TUBE_VERT_RIGHT,
+    EL_TUBE_HORIZ_UP,
+    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_LEFT_UP,
+    EL_TUBE_LEFT_DOWN,
+    EL_TUBE_RIGHT_UP,
+    EL_TUBE_RIGHT_DOWN
   };
-  static int ep_over_player_num = sizeof(ep_over_player)/sizeof(int);
+  static int ep_over_player_num = SIZEOF_ARRAY_INT(ep_over_player);
 
   static int ep_active_bomb[] =
   {
@@ -1693,7 +1402,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[] =
   {
@@ -1710,7 +1419,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[] =
   {
@@ -1727,7 +1436,23 @@ 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[] =
+  {
+    EL_TUBE_CROSS,
+    EL_TUBE_VERTICAL,
+    EL_TUBE_HORIZONTAL,
+    EL_TUBE_VERT_LEFT,
+    EL_TUBE_VERT_RIGHT,
+    EL_TUBE_HORIZ_UP,
+    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_LEFT_UP,
+    EL_TUBE_LEFT_DOWN,
+    EL_TUBE_RIGHT_UP,
+    EL_TUBE_RIGHT_DOWN
+  };
+  static int ep_tube_num = SIZEOF_ARRAY_INT(ep_tube);
 
   static long ep1_bit[] =
   {
@@ -1766,7 +1491,8 @@ void InitElementProperties()
   static long ep2_bit[] =
   {
     EP_BIT_BELT,
-    EP_BIT_BELT_SWITCH
+    EP_BIT_BELT_SWITCH,
+    EP_BIT_TUBE
   };
   static int *ep1_array[] =
   {
@@ -1805,7 +1531,8 @@ void InitElementProperties()
   static int *ep2_array[] =
   {
     ep_belt,
-    ep_belt_switch
+    ep_belt_switch,
+    ep_tube
   };
   static int *ep1_num[] =
   {
@@ -1844,10 +1571,11 @@ void InitElementProperties()
   static int *ep2_num[] =
   {
     &ep_belt_num,
-    &ep_belt_switch_num
+    &ep_belt_switch_num,
+    &ep_tube_num
   };
-  static int num_properties1 = sizeof(ep1_num)/sizeof(int *);
-  static int num_properties2 = sizeof(ep2_num)/sizeof(int *);
+  static int num_properties1 = SIZEOF_ARRAY(ep1_num, int *);
+  static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *);
 
   for(i=0; i<MAX_ELEMENTS; i++)
   {
@@ -1862,53 +1590,42 @@ void InitElementProperties()
     for(j=0; j<*(ep2_num[i]); j++)
       Elementeigenschaften2[(ep2_array[i])[j]] |= ep2_bit[i];
 
-  for(i=EL_CHAR_START; i<EL_CHAR_END; i++)
+  for(i=EL_CHAR_START; i<=EL_CHAR_END; i++)
     Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
 }
 
-void CloseAllAndExit(int exit_value)
+void Execute_Debug_Command(char *command)
 {
-  int i;
-
-  if (sound_process_id)
+  if (strcmp(command, "create soundinfo.conf") == 0)
   {
-    StopSounds();
-    kill(sound_process_id, SIGTERM);
-    FreeSounds(NUM_SOUNDS);
-  }
+    int i;
 
-  for(i=0; i<NUM_PIXMAPS; i++)
-  {
-    if (pix[i])
-    {
-#ifdef USE_XPM_LIBRARY
-      if (i < NUM_PICTURES)	/* XPM pictures */
-      {
-	XFreeColors(display,DefaultColormap(display,screen),
-		    xpm_att[i].pixels,xpm_att[i].npixels,0);
-	XpmFreeAttributes(&xpm_att[i]);
-      }
-#endif
-      XFreePixmap(display,pix[i]);
-    }
-    if (clipmask[i])
-      XFreePixmap(display,clipmask[i]);
-    if (clip_gc[i])
-      XFreeGC(display, clip_gc[i]);
+    printf("# You can configure additional/alternative sound effects here\n");
+    printf("# (The sounds below are default and therefore commented out.)\n");
+    printf("\n");
+
+    for (i=0; i<NUM_SOUND_EFFECTS; i++)
+      printf("# %s\n",
+	     getFormattedSetupEntry(sound_effects[i].text,
+				    sound_effects[i].default_filename));
   }
+}
+
+void CloseAllAndExit(int exit_value)
+{
+  int i;
 
-  if (gc)
-    XFreeGC(display, gc);
+  StopSounds();
+  FreeAllSounds();
+  FreeAllMusic();
+  CloseAudio();		/* called after freeing sounds (needed for SDL) */
 
-  if (display)
-  {
-    XAutoRepeatOn(display);
-    XCloseDisplay(display);
-  }
+  FreeTileClipmasks();
+  for(i=0; i<NUM_BITMAPS; i++)
+    FreeBitmap(pix[i]);
 
-#ifdef MSDOS
-  dumpErrorFile();
-#endif
+  CloseVideoDisplay();
+  ClosePlatformDependantStuff();
 
   exit(exit_value);
 }