rnd-19980930-1
[rocksndiamonds.git] / src / init.c
index 8032ffb3d82bd798bd690dea25364937cdc4c3a8..27247acdb95fa296aba71e4163274e7de770ef31 100644 (file)
@@ -1,28 +1,71 @@
 /***********************************************************
 *  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 <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.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 "gfxload.h"
+#include "gifload.h"
+
+#ifdef DEBUG
+/*
+#define DEBUG_TIMING
+*/
+#endif
+
+struct PictureFileInfo
+{
+  char *picture_filename;
+  BOOL picture_with_mask;
+};
+
+struct IconFileInfo
+{
+  char *picture_filename;
+  char *picturemask_filename;
+};
 
 static int sound_process_id = 0;
 
+static void InitServer(void);
+static void InitLevelAndPlayerInfo(void);
+static void InitDisplay(int, char **);
+static void InitSound(void);
+static void InitSoundProcess(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[])
 {
+
+
+  /* TEST TEST TEST */
+  InitServer();
+  /* TEST TEST TEST */
+
+
   InitLevelAndPlayerInfo();
 
   InitCounter();
@@ -36,17 +79,155 @@ void OpenAll(int argc, char *argv[])
 
   InitDisplay(argc, argv);
   InitWindow(argc, argv);
+
+  XMapWindow(display, window);
+  XFlush(display);
+
   InitGfx();
   InitElementProperties();
 
   DrawMainMenu();
+}
 
-  XMapWindow(display, window);
-  XFlush(display);
+
+
+/* TEST STUFF -------------------------------------------------------------- */
+
+int norestart = 0;
+int nospeedup = 0;
+
+/* server stuff */
+
+#define DEFAULTPORT    19503
+#define BUFLEN         4096
+
+int sfd;
+unsigned char realbuf[512], readbuf[BUFLEN], writbuf[BUFLEN];
+unsigned char *buf = realbuf + 4;
+int nread = 0, nwrite = 0;
+
+void fatal(char *s)
+{
+  fprintf(stderr, "%s.\n", s);
+  exit(1);
+}
+
+void u_sleep(int i)
+{
+  struct timeval tm;
+  tm.tv_sec = i / 1000000;
+  tm.tv_usec = i % 1000000;
+  select(0, NULL, NULL, NULL, &tm);
+}
+
+void startserver()
+{
+  char *options[2];
+  int n = 0;
+
+  options[0] = options[1] = NULL;
+  if (norestart)
+    options[n++] = "-norestart";
+  if (nospeedup)
+    options[n++] = "-nospeedup";
+
+  switch (fork())
+  {
+    case 0:
+      execlp(
+#ifdef XTRISPATH
+      XTRISPATH "/rnd_server",
+#else
+      "rnd_server",
+#endif
+      "rnd_server", "-once", "-v", options[0], options[1], NULL);
+
+      fprintf(stderr, "Can't start server '%s'.\n",
+#ifdef XTRISPATH
+       XTRISPATH "/xtserv");
+#else
+       "xtserv");
+#endif
+
+      _exit(1);
+    
+    case -1:
+      fatal("fork() failed");
+    
+    default:
+      return;
+  }
 }
 
+void connect2server(char *host, int port)
+{
+  struct hostent *hp;
+  struct sockaddr_in s;
+  struct protoent *tcpproto;
+  int on = 1, i;
+
+  if (host)
+  {
+    if ((s.sin_addr.s_addr = inet_addr(host)) == -1)
+    {
+      hp = gethostbyname(host);
+      if (!hp)
+       fatal("Host not found");
+      s.sin_addr = *(struct in_addr *)(hp->h_addr_list[0]);
+    }
+  }
+  else
+    s.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+  s.sin_port = htons(port);
+  s.sin_family = AF_INET;
+  sfd = socket(PF_INET, SOCK_STREAM, 0);
+  if (sfd < 0)
+    fatal("Out of file descriptors");
+  if ((tcpproto = getprotobyname("tcp")) != NULL)
+    setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int));
+
+  if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) < 0)
+  {
+    if (!host)
+    {
+      printf("No xtris server on localhost - starting up one ...\n");
+      startserver();
+      for (i=0; i<6; i++)
+      {
+       u_sleep(500000);
+       close(sfd);
+       sfd = socket(PF_INET, SOCK_STREAM, 0);
+       if (sfd < 0)
+         fatal("Out of file descriptors");
+       setsockopt(sfd, tcpproto->p_proto, TCP_NODELAY, (char *)&on, sizeof(int));
+       if (connect(sfd, (struct sockaddr *)&s, sizeof(s)) >= 0)
+         break;
+      }
+      if (i==6)
+       fatal("Can't connect to server");
+    }
+    else
+      fatal("Can't connect to server");
+  }
+}
+
+void InitServer()
+{
+  if (server_port == 0)
+    server_port = DEFAULTPORT;
+
+  connect2server(server_host, server_port);
+}
+
+/* TEST STUFF -------------------------------------------------------------- */
+
+
+
 void InitLevelAndPlayerInfo()
 {
+  local_player = &stored_player[0];
+
   if (!LoadLevelInfo())                        /* global level info */
     CloseAll();
 
@@ -61,6 +242,7 @@ void InitSound()
   if (sound_status==SOUND_OFF)
     return;
 
+#ifndef MSDOS
   if (access(sound_device_name,W_OK)<0)
   {
     fprintf(stderr,"%s: cannot access sound device - no sounds\n",progname);
@@ -82,9 +264,16 @@ void InitSound()
   sound_loops_allowed = TRUE;
   sound_loops_on = TRUE;
 #endif
+#else
+  sound_loops_allowed = TRUE;
+  sound_loops_on = TRUE;
+#endif
 
   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]))
     {
@@ -99,6 +288,7 @@ void InitSoundProcess()
   if (sound_status==SOUND_OFF)
     return;
 
+#ifndef MSDOS
   if (pipe(sound_pipe)<0)
   {
     fprintf(stderr,"%s: cannot create pipe - no sounds\n",progname);
@@ -117,6 +307,9 @@ void InitSoundProcess()
     SoundServer();
   else                         /* we are parent */
     close(sound_pipe[0]);      /* no reading from pipe needed */
+#else
+  SoundServer();
+#endif
 }
 
 void InitJoystick()
@@ -124,6 +317,7 @@ void InitJoystick()
   if (global_joystick_status==JOYSTICK_OFF)
     return;
 
+#ifndef MSDOS
   if (access(joystick_device_name[joystick_nr],R_OK)<0)
   {
     fprintf(stderr,"%s: cannot access joystick device '%s'\n",
@@ -142,11 +336,17 @@ void InitJoystick()
 
   joystick_status = JOYSTICK_AVAILABLE;
   LoadJoystickData();
+#else
+  joystick_status = JOYSTICK_AVAILABLE;
+#endif
 }
 
 void InitDisplay(int argc, char *argv[])
 {
   char *display_name = NULL;
+  XVisualInfo vinfo_template, *vinfo;
+  int num_visuals;
+  unsigned int depth;
   int i;
 
   /* get X server to connect to, if given as an argument */
@@ -173,9 +373,34 @@ void InitDisplay(int argc, char *argv[])
   }
   
   screen = DefaultScreen(display);
+  visual = DefaultVisual(display, screen);
+  depth  = DefaultDepth(display, screen);
   cmap   = DefaultColormap(display, screen);
-  pen_fg = WhitePixel(display,screen);
-  pen_bg = BlackPixel(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)))
+  {
+    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);
+  }
 }
 
 void InitWindow(int argc, char *argv[])
@@ -191,21 +416,42 @@ void InitWindow(int argc, char *argv[])
   XTextProperty windowName, iconName;
   XGCValues gc_values;
   unsigned long gc_valuemask;
-  char *window_name = "Rocks'n'Diamonds";
-  char *icon_name = "Rocks'n'Diamonds";
+  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;
 
+  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);
+                              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",GFX_PATH,icon_pic.picture_filename);
   XReadBitmapFile(display,window,icon_filename,
@@ -229,9 +475,16 @@ void InitWindow(int argc, char *argv[])
     exit(-1);
   }
 
-  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 (win_xpos || win_ypos)
+  {
+    size_hints.x = win_xpos;
+    size_hints.y = win_ypos;
+    size_hints.flags |= PPosition;
+  }
 
   if (!XStringListToTextProperty(&window_name, 1, &windowName))
   {
@@ -268,6 +521,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;
@@ -277,105 +531,109 @@ void InitWindow(int argc, char *argv[])
   gc = XCreateGC(display, window, gc_valuemask, &gc_values);
 }
 
+void DrawInitText(char *text, int ypos, int color)
+{
+  if (display && window && pix[PIX_SMALLFONT])
+  {
+    XFillRectangle(display,window,gc,0,ypos, WIN_XSIZE,FONT2_YSIZE);
+    DrawTextExt(window,gc,(WIN_XSIZE-strlen(text)*FONT2_XSIZE)/2,
+               ypos,text,FS_SMALL,color);
+    XFlush(display);
+  }
+}
+
 void InitGfx()
 {
-  int i,j,x,y;
-  int xpm_err, xbm_err;
-  unsigned int width,height;
-  int hot_x,hot_y;
-  XGCValues gc_values;
-  unsigned long gc_valuemask;
+  int i,j;
+  GC copy_clipmask_gc;
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
-  char filename[256];
-  Pixmap shapemask;
 
-  static struct PictureFile pic[NUM_PICTURES] =
+#ifdef MSDOS
+  static struct PictureFileInfo pic[NUM_PICTURES] =
+  {
+    { "Screen",        TRUE },
+    { "Door",  TRUE },
+    { "Heroes",        TRUE },
+    { "Toons", TRUE },
+    { "Font",  FALSE },
+    { "Font2", FALSE }
+  }; 
+#else
+  static struct PictureFileInfo pic[NUM_PICTURES] =
   {
-    "RocksScreen.xpm",         "RocksScreenMaske.xbm",
-    "RocksDoor.xpm",           "RocksDoorMaske.xbm",
-    "RocksToons.xpm",          "RocksToonsMaske.xbm",
-    "RocksFont.xpm",           NULL,
-    "RocksFont2.xpm",          NULL
+    { "RocksScreen",   TRUE },
+    { "RocksDoor",     TRUE },
+    { "RocksHeroes",   TRUE },
+    { "RocksToons",    TRUE },
+    { "RocksFont",     FALSE },
+    { "RocksFont2",    FALSE }
   }; 
+#endif
 
-  for(i=0;i<NUM_PICTURES;i++)
+  static struct
   {
-    if (pic[i].picture_filename)
-    {
-      sprintf(filename,"%s/%s",GFX_PATH,pic[i].picture_filename);
+    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_SOKOBAN_OBJEKT, 1 },
+    { GFX_FUNKELN_BLAU, 3 },
+    { GFX_FUNKELN_WEISS, 3 },
+    { -1, 0 }
+  };
 
-      xpm_att[i].valuemask = XpmCloseness;
-      xpm_att[i].closeness = 20000;
-      xpm_err = XpmReadFileToPixmap(display,window,filename,
-                                   &pix[i],&shapemask,&xpm_att[i]);
-      switch(xpm_err)
-      {
-       case XpmOpenFailed:
-          fprintf(stderr,"Xpm file open failed on '%s' !\n",filename);
-         CloseAll();
-         exit(-1);
-       case XpmFileInvalid:
-         fprintf(stderr,"Invalid Xpm file '%s'!\n",filename);
-         CloseAll();
-         exit(-1);
-       case XpmNoMemory:
-         fprintf(stderr,"Not enough memory !\n");      
-         CloseAll();
-         exit(1);
-       case XpmColorFailed:
-         fprintf(stderr,"Can`t get any colors...\n");
-         CloseAll();
-         exit(-1);
-       default:
-         break;
-      }
-      if (!pix[i])
-      {
-       fprintf(stderr, "%s: cannot read Xpm file '%s'.\n",
-               progname,filename);
-       CloseAll();
-       exit(-1);
-      }
-    }
+#ifdef DEBUG_TIMING
+  long count1, count2;
+  count1 = Counter();
+#endif
 
-    if (pic[i].picturemask_filename)
-    {
-      sprintf(filename,"%s/%s",GFX_PATH,pic[i].picturemask_filename);
+  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)
+      LoadGfx(i,&pic[i]);
+
+#ifdef DEBUG_TIMING
+  count2 = Counter();
+  printf("SUMMARY: %.2f SECONDS LOADING TIME\n",(float)(count2-count1)/1000.0);
+#endif
 
-      xbm_err = XReadBitmapFile(display,window,filename,
-                               &width,&height,&clipmask[i],&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;
-       case BitmapFileInvalid:
-         fprintf(stderr,"Bitmap file invalid: '%s' !\n",filename);
-         CloseAll();
-         exit(-1);
-         break;
-       case BitmapNoMemory:
-         fprintf(stderr,"No memory for file '%s' !\n",filename);
-         CloseAll();
-         exit(-1);
-         break;
-       default:
-         break;
-      }
-      if (!clipmask[i])
-      {
-       fprintf(stderr, "%s: cannot read X11 bitmap file '%s'.\n",
-               progname,filename);
-       CloseAll();
-       exit(-1);
-      }
-    }
-  }
 
   pix[PIX_DB_BACK] = XCreatePixmap(display, window,
                                   WIN_XSIZE,WIN_YSIZE,
@@ -383,54 +641,282 @@ void InitGfx()
   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));
+
+  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++)
+  {
+    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;
 
-  clipmask[PIX_FADEMASK] = XCreatePixmap(display, window,
-                                        SXSIZE+TILEX,SYSIZE+TILEY,1);
+      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);
 
-  if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR] || !clipmask[PIX_FADEMASK])
+      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])
   {
     fprintf(stderr, "%s: cannot create additional Pixmaps!\n",progname);
     CloseAll();
     exit(-1);
   }
 
-  /* create GC for drawing with bitplane depth */
-  gc_values.graphics_exposures = False;
-  gc_values.foreground = pen_bg;
-  gc_values.background = pen_bg;
-  gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground;
-  plane_gc = XCreateGC(display, clipmask[PIX_BACK], gc_valuemask, &gc_values);
-
-  for(y=0;y<=SCR_FIELDY;y++) for(x=0;x<=SCR_FIELDX;x++)
-    XCopyArea(display,clipmask[PIX_BACK],clipmask[PIX_FADEMASK],plane_gc,
-             SX+2*TILEX,SY+10*TILEY,TILEX,TILEY,x*TILEX,y*TILEY);
-
   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);
-  XFillRectangle(display,backbuffer,gc,
+  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);
+
+  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 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;
+  Pixmap shapemask;
+  char *picture_ext = ".xpm";
+  char *picturemask_ext = "Mask.xbm";
+#else
+  int gif_err;
+  char *picture_ext = ".gif";
+#endif
+
+#ifdef DEBUG_TIMING
+  long count1, count2;
+#endif
+
+  /* Grafik laden */
+  if (pic->picture_filename)
+  {
+    sprintf(basefilename,"%s%s",pic->picture_filename,picture_ext);
+    DrawInitText(basefilename,150,FC_YELLOW);
+    sprintf(filename,"%s/%s",GFX_PATH,basefilename);
+
+#ifdef MSDOS
+    rest(100);
+#endif MSDOS
+
+#ifdef DEBUG_TIMING
+    count1 = Counter();
+#endif
 
-  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;
+#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,"Cannot open Xpm file '%s' !\n",filename);
+       CloseAll();
+       exit(-1);
+      case XpmFileInvalid:
+       fprintf(stderr,"Invalid Xpm file '%s'!\n",filename);
+       CloseAll();
+       exit(-1);
+      case XpmNoMemory:
+       fprintf(stderr,"Not enough memory for Xpm file '%s'!\n",filename);
+       CloseAll();
+       exit(1);
+      case XpmColorFailed:
+       fprintf(stderr,"Can't get colors for Xpm file '%s'!\n",filename);
+       CloseAll();
+       exit(-1);
+      default:
+       break;
+    }
+
+#ifdef DEBUG_TIMING
+    count2 = Counter();
+    printf("XPM LOADING %s IN %.2f SECONDS\n",
+          filename,(float)(count2-count1)/1000.0);
+#endif
+
+#else 
+
+    gif_err = Read_GIF_to_Pixmaps(display, window, filename,
+                                 &pix[pos], &clipmask[pos]);
+
+    switch(gif_err)
+    {
+      case GIF_Success:
+        break;
+      case GIF_OpenFailed:
+        fprintf(stderr,"Cannot open GIF file '%s' !\n",filename);
+       CloseAll();
+       exit(-1);
+      case GIF_ReadFailed:
+        fprintf(stderr,"Cannot read GIF file '%s' !\n",filename);
+       CloseAll();
+       exit(-1);
+      case GIF_FileInvalid:
+       fprintf(stderr,"Invalid GIF file '%s'!\n",filename);
+       CloseAll();
+       exit(-1);
+      case GIF_NoMemory:
+       fprintf(stderr,"Not enough memory for GIF file '%s'!\n",filename);
+       CloseAll();
+       exit(1);
+      case GIF_ColorFailed:
+       fprintf(stderr,"Can't get colors for GIF file '%s'!\n",filename);
+       CloseAll();
+       exit(-1);
+      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])
+    {
+      fprintf(stderr, "%s: cannot get graphics for '%s'.\n",
+             progname, pic->picture_filename);
+      CloseAll();
+      exit(-1);
+    }
+  }
+
+  /* zugehörige Maske laden (wenn vorhanden) */
+  if (pic->picture_with_mask)
+  {
+
+#ifdef XPM_INCLUDE_FILE
+
+    sprintf(basefilename,"%s%s",pic->picture_filename,picturemask_ext);
+    DrawInitText(basefilename,150,FC_YELLOW);
+    sprintf(filename,"%s/%s",GFX_PATH,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;
+      case BitmapFileInvalid:
+       fprintf(stderr,"Bitmap file invalid: '%s' !\n",filename);
+       CloseAll();
+       exit(-1);
+       break;
+      case BitmapNoMemory:
+       fprintf(stderr,"No memory for file '%s' !\n",filename);
+       CloseAll();
+       exit(-1);
+       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 get clipmask for '%s'.\n",
+             progname, pic->picture_filename);
+      CloseAll();
+      exit(-1);
+    }
+  }
 }
 
 void InitElementProperties()
@@ -441,7 +927,8 @@ void InitElementProperties()
   {
     EL_AMOEBE_NASS,
     EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL
+    EL_AMOEBE_VOLL,
+    EL_AMOEBE_BD
   };
   static int ep_amoebalive_num = sizeof(ep_amoebalive)/sizeof(int);
 
@@ -450,20 +937,11 @@ void InitElementProperties()
     EL_AMOEBE_TOT,
     EL_AMOEBE_NASS,
     EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL
+    EL_AMOEBE_VOLL,
+    EL_AMOEBE_BD
   };
   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,
@@ -490,6 +968,7 @@ void InitElementProperties()
   {
     EL_BETON,
     EL_MAUERWERK,
+    EL_MAUER_LEBT,
     EL_FELSBODEN,
     EL_AUSGANG_ZU,
     EL_AUSGANG_ACT,
@@ -498,10 +977,15 @@ void InitElementProperties()
     EL_AMOEBE_NASS,
     EL_AMOEBE_NORM,
     EL_AMOEBE_VOLL,
+    EL_AMOEBE_BD,
     EL_MORAST_VOLL,
     EL_MORAST_LEER,
     EL_SIEB_VOLL,
     EL_SIEB_LEER,
+    EL_SIEB_TOT,
+    EL_SIEB2_VOLL,
+    EL_SIEB2_LEER,
+    EL_SIEB2_TOT,
     EL_LIFE,
     EL_LIFE_ASYNC,
     EL_BADEWANNE1,
@@ -537,6 +1021,10 @@ void InitElementProperties()
     EL_FELSBODEN,
     EL_FELSBROCKEN,
     EL_EDELSTEIN,
+    EL_EDELSTEIN_BD,
+    EL_EDELSTEIN_GELB,
+    EL_EDELSTEIN_ROT,
+    EL_EDELSTEIN_LILA,
     EL_DIAMANT,
     EL_BOMBE,
     EL_KOKOSNUSS,
@@ -547,7 +1035,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);
 
@@ -555,22 +1044,51 @@ void InitElementProperties()
   {
     EL_KAEFER,
     EL_FLIEGER,
+    EL_BUTTERFLY,
+    EL_FIREFLY,
     EL_MAMPFER,
-    EL_ZOMBIE,
+    EL_MAMPFER2,
+    EL_ROBOT,
     EL_PACMAN
   };
   static int ep_enemy_num = sizeof(ep_enemy)/sizeof(int);
 
+  static int ep_mauer[] =
+  {
+    EL_BETON,
+    EL_PFORTE1,
+    EL_PFORTE2,
+    EL_PFORTE3,
+    EL_PFORTE4,
+    EL_PFORTE1X,
+    EL_PFORTE2X,
+    EL_PFORTE3X,
+    EL_PFORTE4X,
+    EL_AUSGANG_ZU,
+    EL_AUSGANG_ACT,
+    EL_AUSGANG_AUF,
+    EL_MAUERWERK,
+    EL_FELSBODEN,
+    EL_MAUER_LEBT,
+    EL_MAUERND
+  };
+  static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int);
+
   static int ep_can_fall[] =
   {
     EL_FELSBROCKEN,
     EL_EDELSTEIN,
+    EL_EDELSTEIN_BD,
+    EL_EDELSTEIN_GELB,
+    EL_EDELSTEIN_ROT,
+    EL_EDELSTEIN_LILA,
     EL_DIAMANT,
     EL_BOMBE,
     EL_KOKOSNUSS,
     EL_TROPFEN,
     EL_MORAST_VOLL,
     EL_SIEB_VOLL,
+    EL_SIEB2_VOLL,
     EL_ZEIT_VOLL,
     EL_ZEIT_LEER
   };
@@ -580,6 +1098,10 @@ void InitElementProperties()
   {
     EL_FELSBROCKEN,
     EL_EDELSTEIN,
+    EL_EDELSTEIN_BD,
+    EL_EDELSTEIN_GELB,
+    EL_EDELSTEIN_ROT,
+    EL_EDELSTEIN_LILA,
     EL_DIAMANT,
     EL_SCHLUESSEL1,
     EL_SCHLUESSEL2,
@@ -597,6 +1119,10 @@ void InitElementProperties()
   {
     EL_FELSBROCKEN,
     EL_EDELSTEIN,
+    EL_EDELSTEIN_BD,
+    EL_EDELSTEIN_GELB,
+    EL_EDELSTEIN_ROT,
+    EL_EDELSTEIN_LILA,
     EL_DIAMANT
   };
   static int ep_can_change_num = sizeof(ep_can_change)/sizeof(int);
@@ -605,9 +1131,17 @@ void InitElementProperties()
   {
     EL_KAEFER,
     EL_FLIEGER,
+    EL_BUTTERFLY,
+    EL_FIREFLY,
     EL_MAMPFER,
-    EL_ZOMBIE,
-    EL_PACMAN
+    EL_MAMPFER2,
+    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);
 
@@ -621,6 +1155,14 @@ void InitElementProperties()
     EL_FLIEGER_O,
     EL_FLIEGER_L,
     EL_FLIEGER_U,
+    EL_BUTTERFLY_R,
+    EL_BUTTERFLY_O,
+    EL_BUTTERFLY_L,
+    EL_BUTTERFLY_U,
+    EL_FIREFLY_R,
+    EL_FIREFLY_O,
+    EL_FIREFLY_L,
+    EL_FIREFLY_U,
     EL_PACMAN_R,
     EL_PACMAN_O,
     EL_PACMAN_L,
@@ -631,7 +1173,9 @@ void InitElementProperties()
   static int ep_dont_touch[] =
   {
     EL_KAEFER,
-    EL_FLIEGER
+    EL_FLIEGER,
+    EL_BUTTERFLY,
+    EL_FIREFLY
   };
   static int ep_dont_touch_num = sizeof(ep_dont_touch)/sizeof(int);
 
@@ -639,70 +1183,277 @@ void InitElementProperties()
   {
     EL_KAEFER,
     EL_FLIEGER,
+    EL_BUTTERFLY,
+    EL_FIREFLY,
     EL_MAMPFER,
-    EL_ZOMBIE,
+    EL_MAMPFER2,
+    EL_ROBOT,
     EL_PACMAN,
     EL_TROPFEN,
     EL_SALZSAEURE
   };
   static int ep_dont_go_to_num = sizeof(ep_dont_go_to)/sizeof(int);
 
+  static int ep_mampf2[] =
+  {
+    EL_ERDREICH,
+    EL_KAEFER,
+    EL_FLIEGER,
+    EL_BUTTERFLY,
+    EL_FIREFLY,
+    EL_MAMPFER,
+    EL_ROBOT,
+    EL_PACMAN,
+    EL_TROPFEN,
+    EL_AMOEBE_TOT,
+    EL_AMOEBE_NASS,
+    EL_AMOEBE_NORM,
+    EL_AMOEBE_VOLL,
+    EL_AMOEBE_BD,
+    EL_EDELSTEIN,
+    EL_EDELSTEIN_BD,
+    EL_EDELSTEIN_GELB,
+    EL_EDELSTEIN_ROT,
+    EL_EDELSTEIN_LILA,
+    EL_DIAMANT
+  };
+  static int ep_mampf2_num = sizeof(ep_mampf2)/sizeof(int);
+
+  static int ep_bd_element[] =
+  {
+    EL_LEERRAUM,
+    EL_ERDREICH,
+    EL_FELSBODEN,
+    EL_FELSBROCKEN,
+    EL_EDELSTEIN_BD,
+    EL_SIEB2_LEER,
+    EL_AUSGANG_ZU,
+    EL_AUSGANG_AUF,
+    EL_BETON,
+    EL_SPIELFIGUR,
+    EL_FIREFLY,
+    EL_FIREFLY_1,
+    EL_FIREFLY_2,
+    EL_FIREFLY_3,
+    EL_FIREFLY_4,
+    EL_BUTTERFLY,
+    EL_BUTTERFLY_1,
+    EL_BUTTERFLY_2,
+    EL_BUTTERFLY_3,
+    EL_BUTTERFLY_4,
+    EL_AMOEBE_BD,
+    EL_CHAR_FRAGE
+  };
+  static int ep_bd_element_num = sizeof(ep_bd_element)/sizeof(int);
+
+  static int ep_sb_element[] =
+  {
+    EL_LEERRAUM,
+    EL_BETON,
+    EL_SOKOBAN_OBJEKT,
+    EL_SOKOBAN_FELD_LEER,
+    EL_SOKOBAN_FELD_VOLL,
+    EL_SPIELFIGUR
+  };
+  static int ep_sb_element_num = sizeof(ep_sb_element)/sizeof(int);
+
+  static int ep_gem[] =
+  {
+    EL_EDELSTEIN,
+    EL_EDELSTEIN_BD,
+    EL_EDELSTEIN_GELB,
+    EL_EDELSTEIN_ROT,
+    EL_EDELSTEIN_LILA,
+    EL_DIAMANT
+  };
+  static int ep_gem_num = sizeof(ep_gem)/sizeof(int);
+
+  static int ep_inactive[] =
+  {
+    EL_LEERRAUM,
+    EL_ERDREICH,
+    EL_MAUERWERK,
+    EL_FELSBODEN,
+    EL_SCHLUESSEL,
+    EL_BETON,
+    EL_AMOEBE_TOT,
+    EL_MORAST_LEER,
+    EL_BADEWANNE,
+    EL_ABLENK_AUS,
+    EL_SCHLUESSEL1,
+    EL_SCHLUESSEL2,
+    EL_SCHLUESSEL3,
+    EL_SCHLUESSEL4,
+    EL_PFORTE1,
+    EL_PFORTE2,
+    EL_PFORTE3,
+    EL_PFORTE4,
+    EL_PFORTE1X,
+    EL_PFORTE2X,
+    EL_PFORTE3X,
+    EL_PFORTE4X,
+    EL_DYNAMIT_AUS,
+    EL_UNSICHTBAR,
+    EL_BIRNE_AUS,
+    EL_BIRNE_EIN,
+    EL_ERZ_EDEL,
+    EL_ERZ_DIAM,
+    EL_ERZ_EDEL_BD,
+    EL_ERZ_EDEL_GELB,
+    EL_DYNABOMB_NR,
+    EL_DYNABOMB_SZ,
+    EL_DYNABOMB_XL,
+    EL_SOKOBAN_OBJEKT,
+    EL_SOKOBAN_FELD_LEER,
+    EL_SOKOBAN_FELD_VOLL,
+    EL_ERZ_EDEL_ROT,
+    EL_ERZ_EDEL_LILA,
+    EL_BADEWANNE1,
+    EL_BADEWANNE2,
+    EL_BADEWANNE3,
+    EL_BADEWANNE4,
+    EL_BADEWANNE5,
+    EL_SIEB_TOT,
+    EL_SIEB2_TOT,
+    EL_AMOEBA2DIAM,
+    EL_BLOCKED
+  };
+  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,
     EP_BIT_MASSIV,
     EP_BIT_SLIPPERY,
     EP_BIT_ENEMY,
+    EP_BIT_MAUER,
     EP_BIT_CAN_FALL,
     EP_BIT_CAN_SMASH,
     EP_BIT_CAN_CHANGE,
     EP_BIT_CAN_MOVE,
     EP_BIT_COULD_MOVE,
     EP_BIT_DONT_TOUCH,
-    EP_BIT_DONT_GO_TO
+    EP_BIT_DONT_GO_TO,
+    EP_BIT_MAMPF2,
+    EP_BIT_BD_ELEMENT,
+    EP_BIT_SB_ELEMENT,
+    EP_BIT_GEM,
+    EP_BIT_INACTIVE,
+    EP_BIT_EXPLOSIVE,
+    EP_BIT_MAMPF3,
+    EP_BIT_PUSHABLE,
+    EP_BIT_PLAYER
   };
   static int *ep_array[] =
   {
     ep_amoebalive,
     ep_amoeboid,
-    ep_badewannoid,
     ep_schluessel,
     ep_pforte,
     ep_solid,
     ep_massiv,
     ep_slippery,
     ep_enemy,
+    ep_mauer,
     ep_can_fall,
     ep_can_smash,
     ep_can_change,
     ep_can_move,
     ep_could_move,
     ep_dont_touch,
-    ep_dont_go_to
+    ep_dont_go_to,
+    ep_mampf2,
+    ep_bd_element,
+    ep_sb_element,
+    ep_gem,
+    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,
     &ep_massiv_num,
     &ep_slippery_num,
     &ep_enemy_num,
+    &ep_mauer_num,
     &ep_can_fall_num,
     &ep_can_smash_num,
     &ep_can_change_num,
     &ep_can_move_num,
     &ep_could_move_num,
     &ep_dont_touch_num,
-    &ep_dont_go_to_num
+    &ep_dont_go_to_num,
+    &ep_mampf2_num,
+    &ep_bd_element_num,
+    &ep_sb_element_num,
+    &ep_gem_num,
+    &ep_inactive_num,
+    &ep_explosive_num,
+    &ep_mampf3_num,
+    &ep_pushable_num,
+    &ep_player_num
   };
   static int num_properties = sizeof(ep_num)/sizeof(int *);
 
@@ -713,7 +1464,7 @@ void InitElementProperties()
     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++)
-    Elementeigenschaften[i] |= EP_BIT_CHAR;
+    Elementeigenschaften[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
 }
 
 void CloseAll()
@@ -731,12 +1482,14 @@ void CloseAll()
   {
     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])
@@ -747,10 +1500,12 @@ void CloseAll()
 
   if (gc)
     XFreeGC(display, gc);
-  if (plane_gc)
-    XFreeGC(display, plane_gc);
 
-  XCloseDisplay(display);
+  if (display)
+  {
+    XAutoRepeatOn(display);
+    XCloseDisplay(display);
+  }
 
   exit(0);
 }