X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Finit.c;h=e19daafde4e658c38b981b711dd60ef64f368108;hp=2d9b3042354422e5cec4b7cd88edeae3be0d7910;hb=cfd77b3698baacb01dff3853c96d0be117db1d30;hpb=a5a03e15b395ba1942c180d1cd0d3a4f43b87f56

diff --git a/src/init.c b/src/init.c
index 2d9b3042..e19daafd 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,41 +1,81 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  init.c                                                  *
 ***********************************************************/
 
+#include <signal.h>
+
 #include "init.h"
 #include "misc.h"
 #include "sound.h"
 #include "screens.h"
 #include "tools.h"
 #include "files.h"
-#include <signal.h>
+#include "joystick.h"
+#include "image.h"
+#include "network.h"
+#include "netserv.h"
+
+#ifdef DEBUG
+/*
+#define DEBUG_TIMING
+*/
+#endif
+
+struct PictureFileInfo
+{
+  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);
+static void InitNetworkServer(void);
+static void InitDisplay(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 InitElementProperties(void);
+
 void OpenAll(int argc, char *argv[])
 {
+  if (options.serveronly)
+  {
+    NetworkServer(options.server_port, options.serveronly);
+
+    /* never reached */
+    exit(0);
+  }
+
   InitLevelAndPlayerInfo();
 
   InitCounter();
   InitSound();
-  InitSoundProcess();
-  InitJoystick();
+  InitSoundServer();
+  InitJoysticks();
   InitRND(NEW_RANDOMIZE);
 
-  signal(SIGINT, CloseAll);
-  signal(SIGTERM, CloseAll);
+  signal(SIGINT, CloseAllAndExit);
+  signal(SIGTERM, CloseAllAndExit);
 
-  InitDisplay(argc, argv);
+  InitDisplay();
   InitWindow(argc, argv);
 
   XMapWindow(display, window);
@@ -45,139 +85,224 @@ void OpenAll(int argc, char *argv[])
   InitElementProperties();
 
   DrawMainMenu();
+
+  InitNetworkServer();
 }
 
 void InitLevelAndPlayerInfo()
 {
+  int i;
+
+  /* choose default local player */
+  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;
+
   if (!LoadLevelInfo())			/* global level info */
-    CloseAll();
+    Error(ERR_EXIT, NULL);
+
+  LoadSetup();				/* global setup info */
+  LoadLevelSetup();			/* info about last played level */
+}
+
+void InitNetworkServer()
+{
+  int nr_wanted;
+
+  if (!options.network)
+    return;
 
-  LoadPlayerInfo(PLAYER_SETUP);		/* global setup info */
-  LoadPlayerInfo(PLAYER_LEVEL);		/* level specific info */
+  nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
+
+  if (!ConnectToServer(options.server_host, options.server_port))
+    Error(ERR_EXIT, "cannot connect to multiplayer server");
+
+  SendToServer_Nickname(setup.alias_name);
+  SendToServer_ProtocolVersion();
+
+  if (nr_wanted)
+    SendToServer_NrWanted(nr_wanted);
 }
 
 void InitSound()
 {
   int i;
 
-  if (sound_status==SOUND_OFF)
+  if (sound_status == SOUND_OFF)
     return;
 
-  if (access(sound_device_name,W_OK)<0)
+#ifndef MSDOS
+  if (access(sound_device_name, W_OK) != 0)
   {
-    fprintf(stderr,"%s: cannot access sound device - no sounds\n",progname);
-    sound_status=SOUND_OFF;
+    Error(ERR_WARN, "cannot access sound device - no sounds");
+    sound_status = SOUND_OFF;
     return;
   }
 
-  if ((sound_device=open(sound_device_name,O_WRONLY))<0)
+  if ((sound_device = open(sound_device_name,O_WRONLY))<0)
   {
-    fprintf(stderr,"%s: cannot open sound device - no sounds\n",progname);
-    sound_status=SOUND_OFF;
+    Error(ERR_WARN, "cannot open sound device - no sounds");
+    sound_status = SOUND_OFF;
     return;
   }
 
   close(sound_device);
-  sound_status=SOUND_AVAILABLE;
+  sound_status = SOUND_AVAILABLE;
 
 #ifdef VOXWARE
   sound_loops_allowed = TRUE;
-  sound_loops_on = TRUE;
+
+  /*
+  setup.sound_loops_on = TRUE;
+  */
+
+#endif
+#else
+  sound_loops_allowed = TRUE;
+
+  /*
+  setup.sound_loops_on = TRUE;
+  */
+
 #endif
 
-  for(i=0;i<NUM_SOUNDS;i++)
+  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;
+      sound_status = SOUND_OFF;
       return;
     }
   }
 }
 
-void InitSoundProcess()
+void InitSoundServer()
 {
-  if (sound_status==SOUND_OFF)
+  if (sound_status == SOUND_OFF)
     return;
 
+#ifndef MSDOS
   if (pipe(sound_pipe)<0)
   {
-    fprintf(stderr,"%s: cannot create pipe - no sounds\n",progname);
-    sound_status=SOUND_OFF;
+    Error(ERR_WARN, "cannot create pipe - no sounds");
+    sound_status = SOUND_OFF;
     return;
   }
 
-  if ((sound_process_id=fork())<0)
+  if ((sound_process_id = fork()) < 0)
   {       
-    fprintf(stderr,"%s: cannot create child process - no sounds\n",progname);
-    sound_status=SOUND_OFF;
+    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
+  SoundServer();
+#endif
 }
 
-void InitJoystick()
+void InitJoysticks()
 {
-  if (global_joystick_status==JOYSTICK_OFF)
-    return;
+  int i;
 
-  if (access(joystick_device_name[joystick_nr],R_OK)<0)
-  {
-    fprintf(stderr,"%s: cannot access joystick device '%s'\n",
-	    progname,joystick_device_name[joystick_nr]);
-    joystick_status = JOYSTICK_OFF;
+  if (global_joystick_status == JOYSTICK_OFF)
     return;
-  }
 
-  if ((joystick_device=open(joystick_device_name[joystick_nr],O_RDONLY))<0)
-  {
-    fprintf(stderr,"%s: cannot open joystick device '%s'\n",
-	    progname,joystick_device_name[joystick_nr]);
-    joystick_status = JOYSTICK_OFF;
-    return;
-  }
+  joystick_status = JOYSTICK_OFF;
 
-  joystick_status = JOYSTICK_AVAILABLE;
-  LoadJoystickData();
-}
+#ifndef MSDOS
+  for (i=0; i<MAX_PLAYERS; i++)
+  {
+    char *device_name = setup.input[i].joy.device_name;
 
-void InitDisplay(int argc, char *argv[])
-{
-  char *display_name = NULL;
-  int i;
+    /* 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;
+    }
 
-  /* get X server to connect to, if given as an argument */
-  for (i=1;i<argc-1;i++)
-  {
-    char *dispstr="-display";
-    int len=MAX(strlen(dispstr),strlen(argv[i]));
+    if (!setup.input[i].use_joystick)
+      continue;
 
-    if (len<4)
+    if (access(device_name, R_OK) != 0)
+    {
+      Error(ERR_WARN, "cannot access joystick device '%s'", device_name);
       continue;
-    else if (!strncmp(argv[i],dispstr,len))
+    }
+
+    if ((stored_player[i].joystick_fd = open(device_name, O_RDONLY)) < 0)
     {
-      display_name=argv[i+1];
-      break;
+      Error(ERR_WARN, "cannot open joystick device '%s'", device_name);
+      continue;
     }
+
+    joystick_status = JOYSTICK_AVAILABLE;
   }
+#else
+  joystick_status = JOYSTICK_AVAILABLE;
+#endif
+}
+
+void InitDisplay()
+{
+  XVisualInfo vinfo_template, *vinfo;
+  int num_visuals;
+  unsigned int depth;
 
   /* connect to X server */
-  if (!(display=XOpenDisplay(display_name)))
+  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);
+
+  /* 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)))
   {
-    fprintf(stderr,"%s: cannot connect to X server %s\n", 
-	    progname, XDisplayName(display_name));
+    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);
   }
-  
-  screen = DefaultScreen(display);
-  cmap   = DefaultColormap(display, screen);
-  pen_fg = WhitePixel(display,screen);
-  pen_bg = BlackPixel(display,screen);
 }
 
 void InitWindow(int argc, char *argv[])
@@ -196,58 +321,74 @@ void InitWindow(int argc, char *argv[])
   char *window_name = WINDOWTITLE_STRING;
   char *icon_name = WINDOWTITLE_STRING;
   long window_event_mask;
-  static struct PictureFile icon_pic =
+  Atom proto_atom = None, delete_atom = None;
+  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);
+
+#ifndef MSDOS
+  static struct IconFileInfo icon_pic =
   {
     "rocks_icon.xbm",
     "rocks_iconmask.xbm"
   };
+#endif
+
+  screen_width = XDisplayWidth(display, screen);
+  screen_height = XDisplayHeight(display, screen);
 
   width = WIN_XSIZE;
   height = WIN_YSIZE;
 
-  window = XCreateSimpleWindow(display, RootWindow(display, screen),
-			    WIN_XPOS, WIN_YPOS, width, height, border_width,
-			    pen_fg, pen_bg);
+  win_xpos = (screen_width - width) / 2;
+  win_ypos = (screen_height - height) / 2;
 
-  sprintf(icon_filename,"%s/%s",GFX_PATH,icon_pic.picture_filename);
+  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.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)
-  {
-    fprintf(stderr, "%s: cannot read icon bitmap file '%s'.\n",
-	    progname,icon_filename);
-    exit(-1);
-  }
+    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
 
-  sprintf(icon_filename,"%s/%s",GFX_PATH,icon_pic.picturemask_filename);
+  sprintf(icon_filename, "%s/%s/%s",
+	  options.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)
-  {
-    fprintf(stderr, "%s: cannot read icon bitmap file '%s'.\n",
-	    progname,icon_filename);
-    exit(-1);
-  }
+    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
 
-  size_hints.flags = PSize | PMinSize | PMaxSize;
   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 (!XStringListToTextProperty(&window_name, 1, &windowName))
+  if (win_xpos || win_ypos)
   {
-    fprintf(stderr, "%s: structure allocation for windowName failed.\n",
-	    progname);
-    exit(-1);
+    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))
-  {
-    fprintf(stderr, "%s: structure allocation for iconName failed.\n",
-	    progname);
-    exit(-1);
-  }
+    Error(ERR_EXIT, "structure allocation for iconName failed");
 
   wm_hints.initial_state = NormalState;
   wm_hints.input = True;
@@ -255,7 +396,7 @@ void InitWindow(int argc, char *argv[])
   wm_hints.icon_mask = iconmask_pixmap;
   wm_hints.flags = StateHint | IconPixmapHint | IconMaskHint | InputHint;
 
-  class_hints.res_name = progname;
+  class_hints.res_name = program_name;
   class_hints.res_class = "Rocks'n'Diamonds";
 
   XSetWMProperties(display, window, &windowName, &iconName, 
@@ -270,6 +411,7 @@ void InitWindow(int argc, char *argv[])
                       ButtonPressMask | ButtonReleaseMask | ButtonMotionMask |
                       KeyPressMask | KeyReleaseMask;
   XSelectInput(display, window, window_event_mask);
+#endif
 
   /* create GC for drawing with window depth */
   gc_values.graphics_exposures = False;
@@ -293,55 +435,183 @@ void DrawInitText(char *text, int ypos, int color)
 void InitGfx()
 {
   int i,j;
+  GC copy_clipmask_gc;
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
-  static struct PictureFile pic[NUM_PICTURES] =
+
+#ifdef MSDOS
+  static struct PictureFileInfo pic[NUM_PICTURES] =
   {
-    { "RocksScreen.xpm",	"RocksScreenMaske.xbm" },
-    { "RocksDoor.xpm",		"RocksDoorMaske.xbm" },
-    { "RocksToons.xpm",		"RocksToonsMaske.xbm" },
-    { "RocksFont.xpm",		NULL },
-    { "RocksFont2.xpm",		NULL }
+    { "Screen",	TRUE },
+    { "Door",	TRUE },
+    { "Heroes",	TRUE },
+    { "Toons",	TRUE },
+    { "Font",	FALSE },
+    { "Font2",	FALSE }
   }; 
+#else
+  static struct PictureFileInfo pic[NUM_PICTURES] =
+  {
+    { "RocksScreen",	TRUE },
+    { "RocksDoor",	TRUE },
+    { "RocksHeroes",	TRUE },
+    { "RocksToons",	TRUE },
+    { "RocksFont",	FALSE },
+    { "RocksFont2",	FALSE }
+  }; 
+#endif
+
+  static struct
+  {
+    int start;
+    int count;
+  }
+  tile_needs_clipping[] =
+  {
+    { GFX_SPIELER1_UP, 4 },
+    { GFX_SPIELER1_DOWN, 4 },
+    { GFX_SPIELER1_LEFT, 4 },
+    { GFX_SPIELER1_RIGHT, 4 },
+    { GFX_SPIELER1_PUSH_LEFT, 4 },
+    { GFX_SPIELER1_PUSH_RIGHT, 4 },
+    { GFX_SPIELER2_UP, 4 },
+    { GFX_SPIELER2_DOWN, 4 },
+    { GFX_SPIELER2_LEFT, 4 },
+    { GFX_SPIELER2_RIGHT, 4 },
+    { GFX_SPIELER2_PUSH_LEFT, 4 },
+    { GFX_SPIELER2_PUSH_RIGHT, 4 },
+    { GFX_SPIELER3_UP, 4 },
+    { GFX_SPIELER3_DOWN, 4 },
+    { GFX_SPIELER3_LEFT, 4 },
+    { GFX_SPIELER3_RIGHT, 4 },
+    { GFX_SPIELER3_PUSH_LEFT, 4 },
+    { GFX_SPIELER3_PUSH_RIGHT, 4 },
+    { GFX_SPIELER4_UP, 4 },
+    { GFX_SPIELER4_DOWN, 4 },
+    { GFX_SPIELER4_LEFT, 4 },
+    { GFX_SPIELER4_RIGHT, 4 },
+    { GFX_SPIELER4_PUSH_LEFT, 4 },
+    { GFX_SPIELER4_PUSH_RIGHT, 4 },
+    { GFX_GEBLUBBER, 4 },
+    { GFX_DYNAMIT, 7 },
+    { GFX_DYNABOMB, 4 },
+    { GFX_EXPLOSION, 8 },
+    { GFX_SOKOBAN_OBJEKT, 1 },
+    { GFX_FUNKELN_BLAU, 3 },
+    { GFX_FUNKELN_WEISS, 3 },
+    { -1, 0 }
+  };
+
+#ifdef DEBUG_TIMING
+  long count1, count2;
+  count1 = Counter();
+#endif
 
   LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]);
   DrawInitText(WINDOWTITLE_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);
 
-  for(i=0;i<NUM_PICTURES;i++)
-    if (i!=PIX_SMALLFONT)
+  for(i=0; i<NUM_PICTURES; i++)
+    if (i != PIX_SMALLFONT)
       LoadGfx(i,&pic[i]);
 
+#ifdef DEBUG_TIMING
+  count2 = Counter();
+  printf("SUMMARY: %.2f SECONDS LOADING TIME\n",(float)(count2-count1)/1000.0);
+#endif
+
+
   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));
-
-  if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR])
+  pix[PIX_DB_FIELD] = XCreatePixmap(display, window,
+				    FXSIZE,FYSIZE,
+				    XDefaultDepth(display,screen));
+
+  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;
+
+  /* create only those clipping Pixmaps we really need */
+  for(i=0; tile_needs_clipping[i].start>=0; i++)
   {
-    fprintf(stderr, "%s: cannot create additional Pixmaps!\n",progname);
-    CloseAll();
-    exit(-1);
+    for(j=0; j<tile_needs_clipping[i].count; j++)
+    {
+      int tile = tile_needs_clipping[i].start + j;
+      int graphic = tile;
+      int src_x, src_y;
+      Pixmap src_pixmap;
+
+      if (graphic >= GFX_START_ROCKSSCREEN &&
+	  graphic <= GFX_END_ROCKSSCREEN)
+      {
+	src_pixmap = clipmask[PIX_BACK];
+	graphic -= GFX_START_ROCKSSCREEN;
+	src_x = SX + (graphic % GFX_PER_LINE) * TILEX;
+	src_y = SY + (graphic / GFX_PER_LINE) * TILEY;
+      }
+      else if (graphic >= GFX_START_ROCKSHEROES &&
+	       graphic <= GFX_END_ROCKSHEROES)
+      {
+	src_pixmap = clipmask[PIX_HEROES];
+	graphic -= GFX_START_ROCKSHEROES;
+	src_x = (graphic % HEROES_PER_LINE) * TILEX;
+	src_y = (graphic / HEROES_PER_LINE) * TILEY;
+      }
+      else if (graphic >= GFX_START_ROCKSFONT &&
+	       graphic <= GFX_END_ROCKSFONT)
+      {
+	src_pixmap = clipmask[PIX_BIGFONT];
+	graphic -= GFX_START_ROCKSFONT;
+	src_x = (graphic % FONT_CHARS_PER_LINE) * TILEX;
+	src_y = (graphic / FONT_CHARS_PER_LINE) * TILEY +
+	  FC_SPECIAL1 * FONT_LINES_PER_FONT * TILEY;
+      }
+      else
+	break;
+
+      tile_clipmask[tile] = XCreatePixmap(display, window, TILEX,TILEY, 1);
+
+      XCopyArea(display,src_pixmap,tile_clipmask[tile],copy_clipmask_gc,
+		src_x,src_y, TILEX,TILEY, 0,0);
+    }
   }
 
-  for(i=0;i<NUM_PIXMAPS;i++)
+  if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR])
+    Error(ERR_EXIT, "cannot create additional pixmaps");
+
+  for(i=0; i<NUM_PIXMAPS; i++)
   {
     if (clipmask[i])
     {
       clip_gc_values.graphics_exposures = False;
-      clip_gc_values.foreground = pen_fg;
-      clip_gc_values.background = pen_bg;
       clip_gc_values.clip_mask = clipmask[i];
-      clip_gc_valuemask =
-	GCGraphicsExposures | GCForeground | GCBackground | GCClipMask;
+      clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
       clip_gc[i] = XCreateGC(display,window,clip_gc_valuemask,&clip_gc_values);
     }
   }
 
-  drawto = drawto_field = backbuffer = pix[PIX_DB_BACK];
+  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);
@@ -350,100 +620,155 @@ void InitGfx()
   XFillRectangle(display,pix[PIX_DB_DOOR],gc,
 		 0,0, 3*DXSIZE,DYSIZE+VYSIZE);
 
-  for(i=0;i<SCR_FIELDX;i++)
-    for(j=0;j<SCR_FIELDY;j++)
-      redraw[i][j]=0;
-  redraw_tiles=0;
-  redraw_mask=REDRAW_ALL;
+  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;
 }
 
-void LoadGfx(int pos, struct PictureFile *pic)
+void LoadGfx(int pos, struct PictureFileInfo *pic)
 {
+  char basefilename[256];
+  char filename[256];
+
+#ifdef XPM_INCLUDE_FILE
   int xpm_err, xbm_err;
   unsigned int width,height;
   int hot_x,hot_y;
-  char filename[256];
   Pixmap shapemask;
+  char *picture_ext = ".xpm";
+  char *picturemask_ext = "Mask.xbm";
+#else
+  int gif_err;
+  char *picture_ext = ".pcx";
+#endif
+
+#ifdef DEBUG_TIMING
+  long count1, count2;
+#endif
 
   /* Grafik laden */
   if (pic->picture_filename)
   {
-    DrawInitText(pic->picture_filename,150,FC_YELLOW);
-    sprintf(filename,"%s/%s",GFX_PATH,pic->picture_filename);
+    sprintf(basefilename, "%s%s", pic->picture_filename, picture_ext);
+    DrawInitText(basefilename, 150, FC_YELLOW);
+    sprintf(filename, "%s/%s/%s",
+	    options.base_directory, GRAPHICS_DIRECTORY, basefilename);
+
+#ifdef MSDOS
+    rest(100);
+#endif MSDOS
+
+#ifdef DEBUG_TIMING
+    count1 = Counter();
+#endif
+
+#ifdef XPM_INCLUDE_FILE
 
     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:
-        fprintf(stderr,"Xpm file open failed on '%s' !\n",filename);
-	CloseAll();
-	exit(-1);
+	Error(ERR_EXIT, "cannot open XPM file '%s'", filename);
       case XpmFileInvalid:
-	fprintf(stderr,"Invalid Xpm file '%s'!\n",filename);
-	CloseAll();
-	exit(-1);
+	Error(ERR_EXIT, "invalid XPM file '%s'", filename);
       case XpmNoMemory:
-	fprintf(stderr,"Not enough memory !\n");	
-	CloseAll();
-	exit(1);
+	Error(ERR_EXIT, "not enough memory for XPM file '%s'", filename);
       case XpmColorFailed:
-	fprintf(stderr,"Can`t get any colors...\n");
-	CloseAll();
-	exit(-1);
+	Error(ERR_EXIT, "cannot get colors for XPM file '%s'", filename);
       default:
 	break;
     }
 
-    if (!pix[pos])
+#ifdef DEBUG_TIMING
+    count2 = Counter();
+    printf("XPM LOADING %s IN %.2f SECONDS\n",
+	   filename,(float)(count2-count1)/1000.0);
+#endif
+
+#else 
+
+    gif_err = Read_PCX_to_Pixmaps(display, window, filename,
+				  &pix[pos], &clipmask[pos]);
+
+    switch(gif_err)
     {
-      fprintf(stderr, "%s: cannot read Xpm file '%s'.\n",
-	      progname,filename);
-      CloseAll();
-      exit(-1);
+      case GIF_Success:
+        break;
+      case GIF_OpenFailed:
+        Error(ERR_EXIT, "cannot open GIF file '%s'", filename);
+      case GIF_ReadFailed:
+        Error(ERR_EXIT, "cannot read GIF file '%s'", filename);
+      case GIF_FileInvalid:
+	Error(ERR_EXIT, "invalid GIF file '%s'", filename);
+      case GIF_NoMemory:
+	Error(ERR_EXIT, "not enough memory for GIF file '%s'", filename);
+      case GIF_ColorFailed:
+	Error(ERR_EXIT, "cannot get colors for GIF file '%s'", filename);
+      default:
+	break;
     }
+
+#ifdef DEBUG_TIMING
+    count2 = Counter();
+    printf("GIF LOADING %s IN %.2f SECONDS\n",
+	   filename,(float)(count2-count1)/1000.0);
+#endif
+
+#endif
+
+    if (!pix[pos])
+      Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename);
   }
 
   /* zugehörige Maske laden (wenn vorhanden) */
-  if (pic->picturemask_filename)
+  if (pic->picture_with_mask)
   {
-    DrawInitText(pic->picturemask_filename,150,FC_YELLOW);
-    sprintf(filename,"%s/%s",GFX_PATH,pic->picturemask_filename);
+
+#ifdef XPM_INCLUDE_FILE
+
+    sprintf(basefilename, "%s%s", pic->picture_filename, picturemask_ext);
+    DrawInitText(basefilename, 150, FC_YELLOW);
+    sprintf(filename, "%s/%s/%s",
+	    options.base_directory, GRAPHICS_DIRECTORY, basefilename);
+
+#ifdef DEBUG_TIMING
+    count1 = Counter();
+#endif
 
     xbm_err = XReadBitmapFile(display,window,filename,
 			      &width,&height,&clipmask[pos],&hot_x,&hot_y);
+
     switch(xbm_err)
     {
       case BitmapSuccess:
         break;
       case BitmapOpenFailed:
-	fprintf(stderr,"Bitmap file open failed on '%s' !\n",filename);
-	CloseAll();
-	exit(-1);
-	break;
+	Error(ERR_EXIT, "cannot open XBM file '%s'", filename);
       case BitmapFileInvalid:
-	fprintf(stderr,"Bitmap file invalid: '%s' !\n",filename);
-	CloseAll();
-	exit(-1);
-	break;
+	Error(ERR_EXIT, "invalid XBM file '%s'", filename);
       case BitmapNoMemory:
-	fprintf(stderr,"No memory for file '%s' !\n",filename);
-	CloseAll();
-	exit(-1);
+	Error(ERR_EXIT, "not enough memory for XBM file '%s'", filename);
 	break;
       default:
 	break;
     }
 
+#ifdef DEBUG_TIMING
+    count2 = Counter();
+    printf("XBM LOADING %s IN %.2f SECONDS\n",
+	   filename,(float)(count2-count1)/1000.0);
+#endif
+
+#endif
+
     if (!clipmask[pos])
-    {
-      fprintf(stderr, "%s: cannot read X11 bitmap file '%s'.\n",
-	      progname,filename);
-      CloseAll();
-      exit(-1);
-    }
+      Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
   }
 }
 
@@ -470,16 +795,6 @@ void InitElementProperties()
   };
   static int ep_amoeboid_num = sizeof(ep_amoeboid)/sizeof(int);
 
-  static int ep_badewannoid[] =
-  {
-    EL_BADEWANNE1,
-    EL_BADEWANNE2,
-    EL_BADEWANNE3,
-    EL_BADEWANNE4,
-    EL_BADEWANNE5
-  };
-  static int ep_badewannoid_num = sizeof(ep_badewannoid)/sizeof(int);
-
   static int ep_schluessel[] =
   {
     EL_SCHLUESSEL1,
@@ -507,6 +822,9 @@ void InitElementProperties()
     EL_BETON,
     EL_MAUERWERK,
     EL_MAUER_LEBT,
+    EL_MAUER_X,
+    EL_MAUER_Y,
+    EL_MAUER_XY,
     EL_FELSBODEN,
     EL_AUSGANG_ZU,
     EL_AUSGANG_ACT,
@@ -573,7 +891,8 @@ void InitElementProperties()
     EL_BIRNE_EIN,
     EL_BIRNE_AUS,
     EL_BADEWANNE1,
-    EL_BADEWANNE2
+    EL_BADEWANNE2,
+    EL_SONDE
   };
   static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
 
@@ -585,7 +904,7 @@ void InitElementProperties()
     EL_FIREFLY,
     EL_MAMPFER,
     EL_MAMPFER2,
-    EL_ZOMBIE,
+    EL_ROBOT,
     EL_PACMAN
   };
   static int ep_enemy_num = sizeof(ep_enemy)/sizeof(int);
@@ -607,6 +926,9 @@ void InitElementProperties()
     EL_MAUERWERK,
     EL_FELSBODEN,
     EL_MAUER_LEBT,
+    EL_MAUER_X,
+    EL_MAUER_Y,
+    EL_MAUER_XY,
     EL_MAUERND
   };
   static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int);
@@ -672,8 +994,13 @@ void InitElementProperties()
     EL_FIREFLY,
     EL_MAMPFER,
     EL_MAMPFER2,
-    EL_ZOMBIE,
-    EL_PACMAN
+    EL_ROBOT,
+    EL_PACMAN,
+    EL_MAULWURF,
+    EL_PINGUIN,
+    EL_SCHWEIN,
+    EL_DRACHE,
+    EL_SONDE
   };
   static int ep_can_move_num = sizeof(ep_can_move)/sizeof(int);
 
@@ -719,7 +1046,7 @@ void InitElementProperties()
     EL_FIREFLY,
     EL_MAMPFER,
     EL_MAMPFER2,
-    EL_ZOMBIE,
+    EL_ROBOT,
     EL_PACMAN,
     EL_TROPFEN,
     EL_SALZSAEURE
@@ -734,7 +1061,7 @@ void InitElementProperties()
     EL_BUTTERFLY,
     EL_FIREFLY,
     EL_MAMPFER,
-    EL_ZOMBIE,
+    EL_ROBOT,
     EL_PACMAN,
     EL_TROPFEN,
     EL_AMOEBE_TOT,
@@ -852,11 +1179,61 @@ void InitElementProperties()
   };
   static int ep_inactive_num = sizeof(ep_inactive)/sizeof(int);
 
+  static int ep_explosive[] =
+  {
+    EL_BOMBE,
+    EL_DYNAMIT,
+    EL_DYNAMIT_AUS,
+    EL_DYNABOMB,
+    EL_DYNABOMB_NR,
+    EL_DYNABOMB_SZ,
+    EL_DYNABOMB_XL,
+    EL_KAEFER,
+    EL_MAULWURF,
+    EL_PINGUIN,
+    EL_SCHWEIN,
+    EL_DRACHE,
+    EL_SONDE
+  };
+  static int ep_explosive_num = sizeof(ep_explosive)/sizeof(int);
+
+  static int ep_mampf3[] =
+  {
+    EL_EDELSTEIN,
+    EL_EDELSTEIN_BD,
+    EL_EDELSTEIN_GELB,
+    EL_EDELSTEIN_ROT,
+    EL_EDELSTEIN_LILA,
+    EL_DIAMANT
+  };
+  static int ep_mampf3_num = sizeof(ep_mampf3)/sizeof(int);
+
+  static int ep_pushable[] =
+  {
+    EL_FELSBROCKEN,
+    EL_BOMBE,
+    EL_KOKOSNUSS,
+    EL_ZEIT_LEER,
+    EL_SOKOBAN_FELD_VOLL,
+    EL_SOKOBAN_OBJEKT,
+    EL_SONDE
+  };
+  static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int);
+
+  static int ep_player[] =
+  {
+    EL_SPIELFIGUR,
+    EL_SPIELER1,
+    EL_SPIELER2,
+    EL_SPIELER3,
+    EL_SPIELER4
+  };
+  static int ep_player_num = sizeof(ep_player)/sizeof(int);
+
   static long ep_bit[] =
   {
     EP_BIT_AMOEBALIVE,
     EP_BIT_AMOEBOID,
-    EP_BIT_BADEWANNOID,
     EP_BIT_SCHLUESSEL,
     EP_BIT_PFORTE,
     EP_BIT_SOLID,
@@ -875,13 +1252,16 @@ void InitElementProperties()
     EP_BIT_BD_ELEMENT,
     EP_BIT_SB_ELEMENT,
     EP_BIT_GEM,
-    EP_BIT_INACTIVE
+    EP_BIT_INACTIVE,
+    EP_BIT_EXPLOSIVE,
+    EP_BIT_MAMPF3,
+    EP_BIT_PUSHABLE,
+    EP_BIT_PLAYER
   };
   static int *ep_array[] =
   {
     ep_amoebalive,
     ep_amoeboid,
-    ep_badewannoid,
     ep_schluessel,
     ep_pforte,
     ep_solid,
@@ -900,13 +1280,16 @@ void InitElementProperties()
     ep_bd_element,
     ep_sb_element,
     ep_gem,
-    ep_inactive
+    ep_inactive,
+    ep_explosive,
+    ep_mampf3,
+    ep_pushable,
+    ep_player
   };
   static int *ep_num[] =
   {
     &ep_amoebalive_num,
     &ep_amoeboid_num,
-    &ep_badewannoid_num,
     &ep_schluessel_num,
     &ep_pforte_num,
     &ep_solid_num,
@@ -925,21 +1308,25 @@ void InitElementProperties()
     &ep_bd_element_num,
     &ep_sb_element_num,
     &ep_gem_num,
-    &ep_inactive_num
+    &ep_inactive_num,
+    &ep_explosive_num,
+    &ep_mampf3_num,
+    &ep_pushable_num,
+    &ep_player_num
   };
   static int num_properties = sizeof(ep_num)/sizeof(int *);
 
-  for(i=0;i<MAX_ELEMENTS;i++)
+  for(i=0; i<MAX_ELEMENTS; i++)
     Elementeigenschaften[i] = 0;
 
-  for(i=0;i<num_properties;i++)
-    for(j=0;j<*(ep_num[i]);j++)
+  for(i=0; i<num_properties; i++)
+    for(j=0; j<*(ep_num[i]); j++)
       Elementeigenschaften[(ep_array[i])[j]] |= ep_bit[i];
-  for(i=EL_CHAR_START;i<EL_CHAR_END;i++)
+  for(i=EL_CHAR_START; i<EL_CHAR_END; i++)
     Elementeigenschaften[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
 }
 
-void CloseAll()
+void CloseAllAndExit(int exit_value)
 {
   int i;
 
@@ -950,16 +1337,18 @@ void CloseAll()
     FreeSounds(NUM_SOUNDS);
   }
 
-  for(i=0;i<NUM_PIXMAPS;i++)
+  for(i=0; i<NUM_PIXMAPS; i++)
   {
     if (pix[i])
     {
+#ifdef XPM_INCLUDE_FILE
       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])
@@ -970,8 +1359,12 @@ void CloseAll()
 
   if (gc)
     XFreeGC(display, gc);
+
   if (display)
+  {
+    XAutoRepeatOn(display);
     XCloseDisplay(display);
+  }
 
-  exit(0);
+  exit(exit_value);
 }