X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=134cf74aeadfee1f092b95fb9496cb1adc9b2b09;hb=33df7a5ca87e883c2b718171fd7d05c22fc0353f;hp=8032ffb3d82bd798bd690dea25364937cdc4c3a8;hpb=c3d03cdffce070695ba0520d00667b42b8460087;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 8032ffb3..134cf74a 100644
--- a/src/init.c
+++ b/src/init.c
@@ -16,11 +16,42 @@
 #include "misc.h"
 #include "sound.h"
 #include "screens.h"
+#include "tools.h"
 #include "files.h"
+#include "joystick.h"
+#include "gfxloader.h"
+
 #include <signal.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 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[])
 {
   InitLevelAndPlayerInfo();
@@ -36,13 +67,14 @@ 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);
 }
 
 void InitLevelAndPlayerInfo()
@@ -191,10 +223,10 @@ 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 =
+  static struct IconFileInfo icon_pic =
   {
     "rocks_icon.xbm",
     "rocks_iconmask.xbm"
@@ -277,105 +309,51 @@ 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;
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
-  char filename[256];
-  Pixmap shapemask;
-
-  static struct PictureFile pic[NUM_PICTURES] =
+  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 }
   }; 
 
-  for(i=0;i<NUM_PICTURES;i++)
-  {
-    if (pic[i].picture_filename)
-    {
-      sprintf(filename,"%s/%s",GFX_PATH,pic[i].picture_filename);
+#ifdef DEBUG_TIMING
+  long count1, count2;
+  count1 = Counter();
+#endif
 
-      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);
-      }
-    }
+  LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]);
+  DrawInitText(WINDOWTITLE_STRING,20,FC_YELLOW);
+  DrawInitText(COPYRIGHT_STRING,50,FC_RED);
+  DrawInitText("Loading graphics:",120,FC_GREEN);
 
-    if (pic[i].picturemask_filename)
-    {
-      sprintf(filename,"%s/%s",GFX_PATH,pic[i].picturemask_filename);
+  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)/100.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,28 +361,17 @@ 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));
 
-  clipmask[PIX_FADEMASK] = XCreatePixmap(display, window,
-					 SXSIZE+TILEX,SYSIZE+TILEY,1);
-
-  if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR] || !clipmask[PIX_FADEMASK])
+  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])
@@ -419,18 +386,216 @@ void InitGfx()
     }
   }
 
-  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, ilbm_err;
+  char *picture_ext = ".gif";
+  char *picturemask_ext = "Mask.ilbm";
+#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 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,"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;
+    }
+
+#else 
+
+    gif_err = Read_GIF_to_Pixmap(display,filename,&pix[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;
+    }
+
+#endif
+
+#ifdef DEBUG_TIMING
+    count2 = Counter();
+    printf("LOADING %s IN %.2f SECONDS\n",
+	   filename,(float)(count2-count1)/100.0);
+#endif
+
+    if (!pix[pos])
+    {
+      fprintf(stderr, "%s: cannot read graphics file '%s'.\n",
+	      progname,filename);
+      CloseAll();
+      exit(-1);
+    }
+  }
+
+  /* zugehörige Maske laden (wenn vorhanden) */
+  if (pic->picture_with_mask)
+  {
+    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
+
+#ifdef XPM_INCLUDE_FILE
+
+    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;
+    }
+
+#else
+
+    ilbm_err = Read_ILBM_to_Bitmap(display,filename,&clipmask[pos]);
 
-  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;
+    switch(ilbm_err)
+    {
+      case ILBM_Success:
+        break;
+      case ILBM_OpenFailed:
+        fprintf(stderr,"Cannot open ILBM file '%s' !\n",filename);
+	CloseAll();
+	exit(-1);
+      case ILBM_ReadFailed:
+        fprintf(stderr,"Cannot read ILBM file '%s' !\n",filename);
+	CloseAll();
+	exit(-1);
+      case ILBM_FileInvalid:
+	fprintf(stderr,"Invalid ILBM file '%s'!\n",filename);
+	CloseAll();
+	exit(-1);
+      case ILBM_NoMemory:
+	fprintf(stderr,"Not enough memory for ILBM file '%s'!\n",filename);
+	CloseAll();
+	exit(1);
+      default:
+	break;
+    }
+
+#endif
+
+#ifdef DEBUG_TIMING
+    count2 = Counter();
+    printf("LOADING %s IN %.2f SECONDS\n",
+	   filename,(float)(count2-count1)/100.0);
+#endif
+
+    if (!clipmask[pos])
+    {
+      fprintf(stderr, "%s: cannot read graphics file '%s'.\n",
+	      progname,filename);
+      CloseAll();
+      exit(-1);
+    }
+  }
 }
 
 void InitElementProperties()
@@ -441,7 +606,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 +616,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 +647,7 @@ void InitElementProperties()
   {
     EL_BETON,
     EL_MAUERWERK,
+    EL_MAUER_LEBT,
     EL_FELSBODEN,
     EL_AUSGANG_ZU,
     EL_AUSGANG_ACT,
@@ -498,10 +656,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 +700,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 +714,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 +723,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 +777,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 +798,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 +810,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 +834,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 +852,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 +862,264 @@ 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 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
   };
   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
   };
   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
   };
   static int num_properties = sizeof(ep_num)/sizeof(int *);
 
@@ -713,7 +1130,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 +1148,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 +1166,8 @@ void CloseAll()
 
   if (gc)
     XFreeGC(display, gc);
-  if (plane_gc)
-    XFreeGC(display, plane_gc);
-
-  XCloseDisplay(display);
+  if (display)
+    XCloseDisplay(display);
 
   exit(0);
 }