X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=2b7836e2c2a8633f9e7925c15d554bc9b4e6fb64;hb=7b47ce7ba0f673f0de5130daf5726104d0b38902;hp=5a643afb69d8a11befd2b3a5bbfce4b54a218b2e;hpb=1d7b4b0ee6ba41cb6f977d35aca97e4965560cd4;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 5a643afb..2b7836e2 100644
--- a/src/init.c
+++ b/src/init.c
@@ -26,8 +26,20 @@
 #include "cartoons.h"
 #include "config.h"
 
+#include "conf_e2g.c"	/* include auto-generated data structure definitions */
+
+
 static char *image_filename[NUM_PICTURES] =
 {
+#if 0
+  "RocksScreen.pcx",
+  "RocksDoor.pcx",
+  "RocksToons.pcx",
+  "RocksFontBig.pcx",
+  "RocksFontSmall.pcx",
+  "RocksFontMedium.pcx",
+  "RocksFontEM.pcx"
+#else
   "RocksScreen.pcx",
   "RocksElements.pcx",
   "RocksDoor.pcx",
@@ -40,17 +52,23 @@ static char *image_filename[NUM_PICTURES] =
   "RocksFontSmall.pcx",
   "RocksFontMedium.pcx",
   "RocksFontEM.pcx"
+#endif
 }; 
 
+static Bitmap *bitmap_font_initial = NULL;
+
+static void InitGlobal(void);
 static void InitSetup(void);
 static void InitPlayerInfo(void);
 static void InitLevelInfo(void);
 static void InitArtworkInfo(void);
 static void InitLevelArtworkInfo(void);
 static void InitNetworkServer(void);
+static void InitArtworkConfig(void);
 static void InitImages(void);
 static void InitMixer(void);
 static void InitSound(void);
+static void InitMusic(void);
 static void InitGfx(void);
 static void InitGfxBackground(void);
 static void InitGadgets(void);
@@ -58,16 +76,14 @@ static void InitElementProperties(void);
 static void InitElementInfo(void);
 static void InitGraphicInfo(void);
 static void InitSoundInfo();
-static void Execute_Debug_Command(char *);
+static void Execute_Command(char *);
 
 void OpenAll(void)
 {
-  if (options.debug_command)
-  {
-    Execute_Debug_Command(options.debug_command);
+  InitGlobal();		/* initialize some global variables */
 
-    exit(0);
-  }
+  if (options.execute_command)
+    Execute_Command(options.execute_command);
 
   if (options.serveronly)
   {
@@ -88,9 +104,11 @@ void OpenAll(void)
   InitSetup();
   InitPlayerInfo();
   InitArtworkInfo();		/* needed before loading gfx, sound & music */
+  InitArtworkConfig();		/* needed before forking sound child process */
+  InitMixer();
 
   InitCounter();
-  InitMixer();
+
   InitJoysticks();
   InitRND(NEW_RANDOMIZE);
 
@@ -100,30 +118,46 @@ void OpenAll(void)
 
   InitEventFilter(FilterMouseMotionEvents);
 
-  InitGfx();
-  InitElementProperties();	/* initializes IS_CHAR() for el2gfx() */
+  InitElementProperties();
   InitElementInfo();
 
+  InitGfx();
+
   InitLevelInfo();
   InitLevelArtworkInfo();
-  InitGadgets();		/* needs to know number of level series */
+
   InitImages();			/* needs to know current level directory */
   InitSound();			/* needs to know current level directory */
+  InitMusic();			/* needs to know current level directory */
 
   InitGfxBackground();
-  InitToons();
+
+  if (global.autoplay_leveldir)
+  {
+    AutoPlayTape();
+    return;
+  }
 
   DrawMainMenu();
 
   InitNetworkServer();
 }
 
-void InitSetup()
+static void InitGlobal()
+{
+  global.autoplay_leveldir = NULL;
+
+  global.frames_per_second = 0;
+  global.fps_slowdown = FALSE;
+  global.fps_slowdown_factor = 1;
+}
+
+static void InitSetup()
 {
   LoadSetup();					/* global setup info */
 }
 
-void InitPlayerInfo()
+static void InitPlayerInfo()
 {
   int i;
 
@@ -136,18 +170,37 @@ void InitPlayerInfo()
   local_player->connected = TRUE;
 }
 
-void InitLevelInfo()
+static void InitLevelInfo()
 {
   LoadLevelInfo();				/* global level info */
   LoadLevelSetup_LastSeries();			/* last played series info */
   LoadLevelSetup_SeriesInfo();			/* last played level info */
 }
 
-void InitArtworkInfo()
+static void InitArtworkInfo()
 {
   LoadArtworkInfo();
 }
 
+static void InitArtworkConfig()
+{
+  static struct ConfigInfo action_suffix[NUM_ACTIONS + 1];
+  static struct ConfigInfo direction_suffix[NUM_DIRECTIONS + 1];
+  static struct ConfigInfo empty[1];
+  int i;
+
+  for (i=0; i<NUM_ACTIONS + 1; i++)
+    action_suffix[i].token = element_action_info[i].suffix;
+  for (i=0; i<NUM_DIRECTIONS + 1; i++)
+    direction_suffix[i].token = element_direction_info[i].suffix;
+  empty[0].token = NULL;
+
+  InitImageList(image_config, NUM_IMAGE_FILES, image_config_suffix,
+		action_suffix, direction_suffix);
+  InitSoundList(sound_config, NUM_SOUND_FILES, sound_config_suffix,
+		action_suffix, empty);
+}
+
 void InitLevelArtworkInfo()
 {
   LoadLevelArtworkInfo();
@@ -176,41 +229,67 @@ void InitNetworkServer()
 #endif
 }
 
-static void InitImages()
+static void InitMixer()
 {
-  InitImageList(image_config, image_config_suffix, NUM_IMAGE_FILES);
+  OpenAudio();
+  StartMixer();
+}
 
-  /* load custom images */
-  ReloadCustomImages();
+static void ReinitializeGraphics()
+{
+  InitGraphicInfo();	/* initialize graphic info from config file */
 
-  InitGraphicInfo();
+  InitFontInfo(bitmap_font_initial,
+	       graphic_info[IMG_FONT_BIG].bitmap,
+	       graphic_info[IMG_FONT_MEDIUM].bitmap,
+	       graphic_info[IMG_FONT_SMALL].bitmap,
+	       graphic_info[IMG_FONT_EM].bitmap);
+
+  SetMainBackgroundImage(IMG_BACKGROUND_DEFAULT);
+  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
+
+  InitGadgets();
+  InitToons();
 }
 
-static void InitMixer()
+static void ReinitializeSounds()
 {
-  OpenAudio();
+  InitSoundInfo();	/* initialize sounds info from config file */
+}
 
-  InitSoundList(sound_config, sound_config_suffix, NUM_SOUND_FILES);
+static void ReinitializeMusic()
+{
+  /* currently nothing to do */
+}
 
-  StartMixer();
+static void InitImages()
+{
+  ReloadCustomImages();
+  ReinitializeGraphics();
 }
 
 static void InitSound()
 {
-  /* load custom sounds and music */
-  InitReloadSounds(artwork.snd_current->identifier);
-  InitReloadMusic(artwork.mus_current->identifier);
+  InitReloadCustomSounds(artwork.snd_current->identifier);
+  ReinitializeSounds();
+}
 
-  InitSoundInfo();
+static void InitMusic()
+{
+  InitReloadCustomMusic(artwork.mus_current->identifier);
+  ReinitializeMusic();
 }
 
 static void InitTileClipmasks()
 {
+#if 0
 #if defined(TARGET_X11)
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
 
 #if defined(TARGET_X11_NATIVE)
+
+#if 0
   GC copy_clipmask_gc;
 
   static struct
@@ -264,13 +343,15 @@ static void InitTileClipmasks()
     { GFX2_SHIELD_ACTIVE, 3 },
     { -1, 0 }
   };
+#endif
+
 #endif /* TARGET_X11_NATIVE */
 #endif /* TARGET_X11 */
 
   int i;
 
   /* initialize pixmap array for special X11 tile clipping to Pixmap 'None' */
-  for(i=0; i<NUM_TILES; i++)
+  for (i=0; i<NUM_TILES; i++)
     tile_clipmask[i] = None;
 
 #if defined(TARGET_X11)
@@ -284,7 +365,8 @@ static void InitTileClipmasks()
   tile_clip_gc = XCreateGC(display, window->drawable,
 			   clip_gc_valuemask, &clip_gc_values);
 
-  for(i=0; i<NUM_BITMAPS; i++)
+#if 0
+  for (i=0; i<NUM_BITMAPS; i++)
   {
     if (pix[i]->clip_mask)
     {
@@ -295,9 +377,11 @@ static void InitTileClipmasks()
 					 clip_gc_valuemask, &clip_gc_values);
     }
   }
+#endif
 
 #if defined(TARGET_X11_NATIVE)
 
+#if 0
   /* create graphic context structures needed for clipping */
   clip_gc_values.graphics_exposures = False;
   clip_gc_valuemask = GCGraphicsExposures;
@@ -305,11 +389,11 @@ static void InitTileClipmasks()
 			       clip_gc_valuemask, &clip_gc_values);
 
   /* create only those clipping Pixmaps we really need */
-  for(i=0; tile_needs_clipping[i].start>=0; i++)
+  for (i=0; tile_needs_clipping[i].start>=0; i++)
   {
     int j;
 
-    for(j=0; j<tile_needs_clipping[i].count; j++)
+    for (j=0; j<tile_needs_clipping[i].count; j++)
     {
       int tile = tile_needs_clipping[i].start + j;
       int graphic = tile;
@@ -329,17 +413,20 @@ static void InitTileClipmasks()
   }
 
   XFreeGC(display, copy_clipmask_gc);
+#endif
 
 #endif /* TARGET_X11_NATIVE */
 #endif /* TARGET_X11 */
+#endif
 }
 
 void FreeTileClipmasks()
 {
+#if 0
 #if defined(TARGET_X11)
   int i;
 
-  for(i=0; i<NUM_TILES; i++)
+  for (i=0; i<NUM_TILES; i++)
   {
     if (tile_clipmask[i] != None)
     {
@@ -352,7 +439,8 @@ void FreeTileClipmasks()
     XFreeGC(display, tile_clip_gc);
   tile_clip_gc = None;
 
-  for(i=0; i<NUM_BITMAPS; i++)
+#if 0
+  for (i=0; i<NUM_BITMAPS; i++)
   {
     if (pix[i] != NULL && pix[i]->stored_clip_gc)
     {
@@ -360,17 +448,17 @@ void FreeTileClipmasks()
       pix[i]->stored_clip_gc = None;
     }
   }
+#endif
+
 #endif /* TARGET_X11 */
+#endif
 }
 
 void InitGfx()
 {
+#if 0
   int i;
-
-  /* initialize some global variables */
-  global.frames_per_second = 0;
-  global.fps_slowdown = FALSE;
-  global.fps_slowdown_factor = 1;
+#endif
 
   /* initialize screen properties */
   InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE,
@@ -380,30 +468,42 @@ void InitGfx()
   InitGfxScrollbufferInfo(FXSIZE, FYSIZE);
 
   /* create additional image buffers for double-buffering */
-  pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
-  pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
+  bitmap_db_field = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
+  bitmap_db_door  = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
 
+#if 0
   pix[PIX_FONT_SMALL] = LoadCustomImage(image_filename[PIX_FONT_SMALL]);
 
   InitFontInfo(NULL, NULL, pix[PIX_FONT_SMALL], NULL);
+#else
+  bitmap_font_initial = LoadCustomImage(image_filename[PIX_FONT_SMALL]);
+
+  InitFontInfo(bitmap_font_initial, NULL, NULL, NULL, NULL);
+#endif
 
   DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
   DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
 
   DrawInitText("Loading graphics:", 120, FC_GREEN);
 
-  for(i=0; i<NUM_PICTURES; i++)
+#if 0
+  for (i=0; i<NUM_PICTURES; i++)
   {
+#if 0
     if (i != PIX_FONT_SMALL)
+#endif
     {
       DrawInitText(image_filename[i], 150, FC_YELLOW);
 
       pix[i] = LoadCustomImage(image_filename[i]);
     }
   }
+#endif
 
+#if 0
   InitFontInfo(pix[PIX_FONT_BIG], pix[PIX_FONT_MEDIUM], pix[PIX_FONT_SMALL],
 	       pix[PIX_FONT_EM]);
+#endif
 
   InitTileClipmasks();
 }
@@ -413,15 +513,16 @@ void InitGfxBackground()
   int x, y;
 
   drawto = backbuffer;
-  fieldbuffer = pix[PIX_DB_FIELD];
+  fieldbuffer = bitmap_db_field;
   SetDrawtoField(DRAW_BACKBUFFER);
 
-  BlitBitmap(pix[PIX_BACK], backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+  BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, 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);
+  ClearRectangle(bitmap_db_door, 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE);
 
-  for(x=0; x<MAX_BUF_XSIZE; x++)
-    for(y=0; y<MAX_BUF_YSIZE; y++)
+  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;
@@ -433,11 +534,21 @@ void ReloadCustomArtwork()
   static boolean last_override_level_graphics = FALSE;
   static boolean last_override_level_sounds = FALSE;
   static boolean last_override_level_music = FALSE;
-
   /* identifier for new artwork; default: artwork configured in setup */
   char *gfx_new_identifier = artwork.gfx_current->identifier;
   char *snd_new_identifier = artwork.snd_current->identifier;
   char *mus_new_identifier = artwork.mus_current->identifier;
+  boolean redraw_screen = FALSE;
+
+  if (leveldir_current_identifier == NULL)
+    leveldir_current_identifier = leveldir_current->identifier;
+
+#if 0
+  printf("CURRENT GFX: '%s' ['%s']\n", artwork.gfx_current->identifier,
+	 leveldir_current->graphics_set);
+  printf("CURRENT LEV: '%s' / '%s'\n", leveldir_current_identifier,
+	 leveldir_current->identifier);
+#endif
 
 #if 0
   printf("graphics --> '%s' ('%s')\n",
@@ -452,10 +563,6 @@ void ReloadCustomArtwork()
   if (!validLevelSeries(leveldir_current))
     return;
 
-#if 0
-  printf("--> '%s'\n", artwork.gfx_current_identifier);
-#endif
-
   /* when a new level series was selected, check if there was a change
      in custom artwork stored in level series directory */
   if (leveldir_current_identifier != leveldir_current->identifier)
@@ -489,43 +596,49 @@ void ReloadCustomArtwork()
   if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 ||
       last_override_level_graphics != setup.override_level_graphics)
   {
-    int i;
+#if 0
+    printf("RELOADING GRAPHICS '%s' -> '%s' ('%s')\n",
+	   artwork.gfx_current_identifier,
+	   artwork.gfx_current->identifier,
+	   gfx_new_identifier);
+#endif
 
     setLevelArtworkDir(artwork.gfx_first);
 
     ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
-    for(i=0; i<NUM_PICTURES; i++)
-    {
-      DrawInitText(image_filename[i], 150, FC_YELLOW);
-      ReloadCustomImage(pix[i], image_filename[i]);
-    }
-
     ReloadCustomImages();
-    InitGraphicInfo();
+    ReinitializeGraphics();
 
     FreeTileClipmasks();
     InitTileClipmasks();
-    InitGfxBackground();
 
-    /* force redraw of (open or closed) door graphics */
-    SetDoorState(DOOR_OPEN_ALL);
-    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
-
-    artwork.gfx_current_identifier = gfx_new_identifier;
+    artwork.gfx_current_identifier = artwork.gfx_current->identifier;
     last_override_level_graphics = setup.override_level_graphics;
+
+    redraw_screen = TRUE;
   }
 
   if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 ||
       last_override_level_sounds != setup.override_level_sounds)
   {
+#if 0
+    printf("RELOADING SOUNDS '%s' -> '%s' ('%s')\n",
+	   artwork.snd_current_identifier,
+	   artwork.snd_current->identifier,
+	   snd_new_identifier);
+#endif
+
     /* set artwork path to send it to the sound server process */
     setLevelArtworkDir(artwork.snd_first);
 
-    InitReloadSounds(snd_new_identifier);
+    InitReloadCustomSounds(snd_new_identifier);
+    ReinitializeSounds();
 
-    artwork.snd_current_identifier = snd_new_identifier;
+    artwork.snd_current_identifier = artwork.snd_current->identifier;
     last_override_level_sounds = setup.override_level_sounds;
+
+    redraw_screen = TRUE;
   }
 
   if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 ||
@@ -534,511 +647,416 @@ void ReloadCustomArtwork()
     /* set artwork path to send it to the sound server process */
     setLevelArtworkDir(artwork.mus_first);
 
-    InitReloadMusic(mus_new_identifier);
+    InitReloadCustomMusic(mus_new_identifier);
+    ReinitializeMusic();
 
-    artwork.mus_current_identifier = mus_new_identifier;
+    artwork.mus_current_identifier = artwork.mus_current->identifier;
     last_override_level_music = setup.override_level_music;
+
+    redraw_screen = TRUE;
   }
 
-#if 0
-  printf("<-- '%s'\n", artwork.gfx_current_identifier);
-#endif
+  if (redraw_screen)
+  {
+    InitGfxBackground();
+
+    /* force redraw of (open or closed) door graphics */
+    SetDoorState(DOOR_OPEN_ALL);
+    CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
+  }
+}
+
+void FreeGadgets()
+{
+  FreeLevelEditorGadgets();
+  FreeGameButtons();
+  FreeTapeButtons();
+  FreeToolButtons();
+  FreeScreenGadgets();
 }
 
 void InitGadgets()
 {
+  static boolean gadgets_initialized = FALSE;
+
+  if (gadgets_initialized)
+    FreeGadgets();
+
   CreateLevelEditorGadgets();
   CreateGameButtons();
   CreateTapeButtons();
   CreateToolButtons();
   CreateScreenGadgets();
+
+  gadgets_initialized = TRUE;
 }
 
 void InitElementInfo()
 {
-  int i, j;
+  int i, act, dir;
 
-  static struct
+  /* set values to -1 to identify later as "uninitialized" values */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    int element;
-    int graphic;
-  }
-  element_to_graphic[] =
-  {
-    { EL_EMPTY,				GFX_LEERRAUM		},
-    { EL_SAND,				GFX_ERDREICH		},
-    { EL_WALL,				GFX_MAUERWERK		},
-    { EL_WALL_CRUMBLED,			GFX_FELSBODEN		},
-    { EL_ROCK,				GFX_FELSBROCKEN		},
-    { EL_KEY,				GFX_SCHLUESSEL		},
-    { EL_EMERALD,			GFX_EDELSTEIN		},
-    { EL_EXIT_CLOSED,			GFX_AUSGANG_ZU		},
-    { EL_AUSGANG_ACT,			GFX_AUSGANG_ACT		},
-    { EL_EXIT_OPEN,			GFX_AUSGANG_AUF		},
-    { EL_PLAYER,			GFX_SPIELFIGUR		},
-    { EL_PLAYER1,			GFX_SPIELER1		},
-    { EL_PLAYER2,			GFX_SPIELER2		},
-    { EL_PLAYER3,			GFX_SPIELER3		},
-    { EL_PLAYER4,			GFX_SPIELER4		},
-    { EL_BUG,				GFX_KAEFER		},
-    { EL_BUG_RIGHT,			GFX_KAEFER_RIGHT	},
-    { EL_BUG_UP,			GFX_KAEFER_UP		},
-    { EL_BUG_LEFT,			GFX_KAEFER_LEFT		},
-    { EL_BUG_DOWN,			GFX_KAEFER_DOWN		},
-    { EL_SPACESHIP,			GFX_FLIEGER		},
-    { EL_SPACESHIP_RIGHT,		GFX_FLIEGER_RIGHT	},
-    { EL_SPACESHIP_UP,			GFX_FLIEGER_UP		},
-    { EL_SPACESHIP_LEFT,		GFX_FLIEGER_LEFT	},
-    { EL_SPACESHIP_DOWN,		GFX_FLIEGER_DOWN	},
-    { EL_BUTTERFLY,			GFX_BUTTERFLY		},
-    { EL_BUTTERFLY_RIGHT,		GFX_BUTTERFLY_RIGHT	},
-    { EL_BUTTERFLY_UP,			GFX_BUTTERFLY_UP	},
-    { EL_BUTTERFLY_LEFT,		GFX_BUTTERFLY_LEFT	},
-    { EL_BUTTERFLY_DOWN,		GFX_BUTTERFLY_DOWN	},
-    { EL_FIREFLY,			GFX_FIREFLY		},
-    { EL_FIREFLY_RIGHT,			GFX_FIREFLY_RIGHT	},
-    { EL_FIREFLY_UP,			GFX_FIREFLY_UP		},
-    { EL_FIREFLY_LEFT,			GFX_FIREFLY_LEFT	},
-    { EL_FIREFLY_DOWN,			GFX_FIREFLY_DOWN	},
-    { EL_YAMYAM,			GFX_MAMPFER		},
-    { EL_ROBOT,				GFX_ROBOT		},
-    { EL_STEELWALL,			GFX_BETON		},
-    { EL_DIAMOND,			GFX_DIAMANT		},
-    { EL_QUICKSAND_EMPTY,		GFX_MORAST_LEER		},
-    { EL_QUICKSAND_FULL,		GFX_MORAST_VOLL		},
-    { EL_QUICKSAND_EMPTYING,		GFX_MORAST_LEER		},
-    { EL_AMOEBA_DROP,			GFX_TROPFEN		},
-    { EL_BOMB,				GFX_BOMBE		},
-    { EL_MAGIC_WALL,			GFX_MAGIC_WALL_OFF	},
-    { EL_MAGIC_WALL_EMPTY,		GFX_MAGIC_WALL_EMPTY	},
-    { EL_MAGIC_WALL_EMPTYING,		GFX_MAGIC_WALL_EMPTY	},
-    { EL_MAGIC_WALL_FULL,		GFX_MAGIC_WALL_FULL	},
-    { EL_MAGIC_WALL_DEAD,		GFX_MAGIC_WALL_DEAD	},
-    { EL_ACID,				GFX_SALZSAEURE		},
-    { EL_AMOEBA_DEAD,			GFX_AMOEBE_TOT		},
-    { EL_AMOEBA_WET,			GFX_AMOEBE_NASS		},
-    { EL_AMOEBA_DRY,			GFX_AMOEBE_NORM		},
-    { EL_AMOEBA_FULL,			GFX_AMOEBE_VOLL		},
-    { EL_BD_AMOEBA,			GFX_AMOEBE_BD		},
-    { EL_AMOEBA_TO_DIAMOND,		GFX_AMOEBA2DIAM		},
-    { EL_AMOEBA_DRIPPING,		GFX_AMOEBE_NASS		},
-    { EL_NUT,				GFX_KOKOSNUSS		},
-    { EL_GAMEOFLIFE,			GFX_LIFE		},
-    { EL_BIOMAZE,			GFX_LIFE_ASYNC		},
-    { EL_DYNAMITE_ACTIVE,		GFX_DYNAMIT		},
-    { EL_STONEBLOCK,			GFX_BADEWANNE		},
-    { EL_ACIDPOOL_TOPLEFT,		GFX_BADEWANNE1		},
-    { EL_ACIDPOOL_TOPRIGHT,		GFX_BADEWANNE2		},
-    { EL_ACIDPOOL_BOTTOMLEFT,		GFX_BADEWANNE3		},
-    { EL_ACIDPOOL_BOTTOM,		GFX_BADEWANNE4		},
-    { EL_ACIDPOOL_BOTTOMRIGHT,		GFX_BADEWANNE5		},
-    { EL_ROBOT_WHEEL,			GFX_ABLENK_AUS		},
-    { EL_ROBOT_WHEEL_ACTIVE,		GFX_ABLENK_EIN		},
-    { EL_KEY1,				GFX_SCHLUESSEL1		},
-    { EL_KEY2,				GFX_SCHLUESSEL2		},
-    { EL_KEY3,				GFX_SCHLUESSEL3		},
-    { EL_KEY4,				GFX_SCHLUESSEL4		},
-    { EL_GATE1,				GFX_PFORTE1		},
-    { EL_GATE2,				GFX_PFORTE2		},
-    { EL_GATE3,				GFX_PFORTE3		},
-    { EL_GATE4,				GFX_PFORTE4		},
-    { EL_GATE1_GRAY,			GFX_PFORTE1X		},
-    { EL_GATE2_GRAY,			GFX_PFORTE2X		},
-    { EL_GATE3_GRAY,			GFX_PFORTE3X		},
-    { EL_GATE4_GRAY,			GFX_PFORTE4X		},
-    { EL_DYNAMITE,			GFX_DYNAMIT_AUS		},
-    { EL_PACMAN,			GFX_PACMAN		},
-    { EL_PACMAN_RIGHT,			GFX_PACMAN_RIGHT	},
-    { EL_PACMAN_UP,			GFX_PACMAN_UP		},
-    { EL_PACMAN_LEFT,			GFX_PACMAN_LEFT		},
-    { EL_PACMAN_DOWN,			GFX_PACMAN_DOWN		},
-    { EL_INVISIBLE_WALL,		GFX_UNSICHTBAR		},
-    { EL_WALL_EMERALD,			GFX_ERZ_EDEL		},
-    { EL_WALL_DIAMOND,			GFX_ERZ_DIAM		},
-    { EL_LAMP,				GFX_BIRNE_AUS		},
-    { EL_LAMP_ACTIVE,			GFX_BIRNE_EIN		},
-    { EL_TIME_ORB_FULL,			GFX_ZEIT_VOLL		},
-    { EL_TIME_ORB_EMPTY,		GFX_ZEIT_LEER		},
-    { EL_WALL_GROWING,			GFX_MAUER_LEBT		},
-    { EL_WALL_GROWING_X,		GFX_MAUER_X		},
-    { EL_WALL_GROWING_Y,		GFX_MAUER_Y		},
-    { EL_WALL_GROWING_XY,		GFX_MAUER_XY		},
-    { EL_BD_DIAMOND,			GFX_EDELSTEIN_BD	},
-    { EL_EMERALD_YELLOW,		GFX_EDELSTEIN_GELB	},
-    { EL_EMERALD_RED,			GFX_EDELSTEIN_ROT	},
-    { EL_EMERALD_PURPLE,		GFX_EDELSTEIN_LILA	},
-    { EL_WALL_BD_DIAMOND,		GFX_ERZ_EDEL_BD		},
-    { EL_WALL_EMERALD_YELLOW,		GFX_ERZ_EDEL_GELB	},
-    { EL_WALL_EMERALD_RED,		GFX_ERZ_EDEL_ROT	},
-    { EL_WALL_EMERALD_PURPLE,		GFX_ERZ_EDEL_LILA	},
-    { EL_DARK_YAMYAM,			GFX_MAMPFER2		},
-    { EL_MAGIC_WALL_BD_OFF,		GFX_MAGIC_WALL_BD_OFF	},
-    { EL_MAGIC_WALL_BD_EMPTY,		GFX_MAGIC_WALL_BD_EMPTY	},
-    { EL_MAGIC_WALL_BD_EMPTYING,	GFX_MAGIC_WALL_BD_EMPTY	},
-    { EL_MAGIC_WALL_BD_FULL,		GFX_MAGIC_WALL_BD_FULL	},
-    { EL_MAGIC_WALL_BD_DEAD,		GFX_MAGIC_WALL_BD_DEAD	},
-    { EL_DYNABOMB_ACTIVE_1,		GFX_DYNABOMB		},
-    { EL_DYNABOMB_ACTIVE_2,		GFX_DYNABOMB		},
-    { EL_DYNABOMB_ACTIVE_3,		GFX_DYNABOMB		},
-    { EL_DYNABOMB_ACTIVE_4,		GFX_DYNABOMB		},
-    { EL_DYNABOMB_NR,			GFX_DYNABOMB_NR		},
-    { EL_DYNABOMB_SZ,			GFX_DYNABOMB_SZ		},
-    { EL_DYNABOMB_XL,			GFX_DYNABOMB_XL		},
-    { EL_SOKOBAN_OBJEKT,		GFX_SOKOBAN_OBJEKT	},
-    { EL_SOKOBAN_FELD_LEER,		GFX_SOKOBAN_FELD_LEER	},
-    { EL_SOKOBAN_FELD_VOLL,		GFX_SOKOBAN_FELD_VOLL	},
-    { EL_MOLE,				GFX_MOLE		},
-    { EL_PENGUIN,			GFX_PINGUIN		},
-    { EL_PIG,				GFX_SCHWEIN		},
-    { EL_DRAGON,			GFX_DRACHE		},
-    { EL_SATELLITE,			GFX_SONDE		},
-    { EL_ARROW_LEFT,			GFX_PFEIL_LEFT		},
-    { EL_ARROW_RIGHT,			GFX_PFEIL_RIGHT		},
-    { EL_ARROW_UP,			GFX_PFEIL_UP		},
-    { EL_ARROW_DOWN,			GFX_PFEIL_DOWN		},
-    { EL_SPEED_PILL,			GFX_SPEED_PILL		},
-    { EL_SP_TERMINAL_ACTIVE,		GFX_SP_TERMINAL		},
-    { EL_SP_BUG_ACTIVE,			GFX_SP_BUG_ACTIVE	},
-    { EL_SP_ZONK,			GFX_SP_ZONK		},
-    { EL_INVISIBLE_STEELWALL,		GFX_INVISIBLE_STEEL	},
-    { EL_BLACK_ORB,			GFX_BLACK_ORB		},
-    { EL_EM_GATE1,			GFX_EM_GATE_1		},
-    { EL_EM_GATE2,			GFX_EM_GATE_2		},
-    { EL_EM_GATE3,			GFX_EM_GATE_3		},
-    { EL_EM_GATE4,			GFX_EM_GATE_4		},
-    { EL_EM_GATE1_GRAY,			GFX_EM_GATE_1X		},
-    { EL_EM_GATE2_GRAY,			GFX_EM_GATE_2X		},
-    { EL_EM_GATE3_GRAY,			GFX_EM_GATE_3X		},
-    { EL_EM_GATE4_GRAY,			GFX_EM_GATE_4X		},
-    { EL_EM_KEY1_FILE,			GFX_EM_KEY_1		},
-    { EL_EM_KEY2_FILE,			GFX_EM_KEY_2		},
-    { EL_EM_KEY3_FILE,			GFX_EM_KEY_3		},
-    { EL_EM_KEY4_FILE,			GFX_EM_KEY_4		},
-    { EL_EM_KEY1,			GFX_EM_KEY_1		},
-    { EL_EM_KEY2,			GFX_EM_KEY_2		},
-    { EL_EM_KEY3,			GFX_EM_KEY_3		},
-    { EL_EM_KEY4,			GFX_EM_KEY_4		},
-    { EL_PEARL,				GFX_PEARL		},
-    { EL_CRYSTAL,			GFX_CRYSTAL		},
-    { EL_WALL_PEARL,			GFX_WALL_PEARL		},
-    { EL_WALL_CRYSTAL,			GFX_WALL_CRYSTAL	},
-    { EL_DOOR_WHITE,			GFX_DOOR_WHITE		},
-    { EL_DOOR_WHITE_GRAY,		GFX_DOOR_WHITE_GRAY	},
-    { EL_KEY_WHITE,			GFX_KEY_WHITE		},
-    { EL_SHIELD_NORMAL,			GFX_SHIELD_PASSIVE	},
-    { EL_SHIELD_ACTIVE,			GFX_SHIELD_ACTIVE	},
-    { EL_EXTRA_TIME,			GFX_EXTRA_TIME		},
-    { EL_SWITCHGATE_OPEN,		GFX_SWITCHGATE_OPEN	},
-    { EL_SWITCHGATE_CLOSED,		GFX_SWITCHGATE_CLOSED	},
-    { EL_SWITCHGATE_SWITCH_UP,		GFX_SWITCHGATE_SWITCH_1	},
-    { EL_SWITCHGATE_SWITCH_DOWN,	GFX_SWITCHGATE_SWITCH_2	},
-    { EL_CONVEYOR_BELT1_LEFT,		GFX_BELT1_LEFT		},
-    { EL_CONVEYOR_BELT1_MIDDLE,		GFX_BELT1_MIDDLE	},
-    { EL_CONVEYOR_BELT1_RIGHT,		GFX_BELT1_RIGHT		},
-    { EL_CONVEYOR_BELT1_SWITCH_LEFT,	GFX_BELT1_SWITCH_LEFT	},
-    { EL_CONVEYOR_BELT1_SWITCH_MIDDLE,	GFX_BELT1_SWITCH_MIDDLE	},
-    { EL_CONVEYOR_BELT1_SWITCH_RIGHT,	GFX_BELT1_SWITCH_RIGHT	},
-    { EL_CONVEYOR_BELT2_LEFT,		GFX_BELT2_LEFT		},
-    { EL_CONVEYOR_BELT2_MIDDLE,		GFX_BELT2_MIDDLE	},
-    { EL_CONVEYOR_BELT2_RIGHT,		GFX_BELT2_RIGHT		},
-    { EL_CONVEYOR_BELT2_SWITCH_LEFT,	GFX_BELT2_SWITCH_LEFT	},
-    { EL_CONVEYOR_BELT2_SWITCH_MIDDLE,	GFX_BELT2_SWITCH_MIDDLE	},
-    { EL_CONVEYOR_BELT2_SWITCH_RIGHT,	GFX_BELT2_SWITCH_RIGHT	},
-    { EL_CONVEYOR_BELT3_LEFT,		GFX_BELT3_LEFT		},
-    { EL_CONVEYOR_BELT3_MIDDLE,		GFX_BELT3_MIDDLE	},
-    { EL_CONVEYOR_BELT3_RIGHT,		GFX_BELT3_RIGHT		},
-    { EL_CONVEYOR_BELT3_SWITCH_LEFT,	GFX_BELT3_SWITCH_LEFT	},
-    { EL_CONVEYOR_BELT3_SWITCH_MIDDLE,	GFX_BELT3_SWITCH_MIDDLE	},
-    { EL_CONVEYOR_BELT3_SWITCH_RIGHT,	GFX_BELT3_SWITCH_RIGHT	},
-    { EL_CONVEYOR_BELT4_LEFT,		GFX_BELT4_LEFT		},
-    { EL_CONVEYOR_BELT4_MIDDLE,		GFX_BELT4_MIDDLE	},
-    { EL_CONVEYOR_BELT4_RIGHT,		GFX_BELT4_RIGHT		},
-    { EL_CONVEYOR_BELT4_SWITCH_LEFT,	GFX_BELT4_SWITCH_LEFT	},
-    { EL_CONVEYOR_BELT4_SWITCH_MIDDLE,	GFX_BELT4_SWITCH_MIDDLE	},
-    { EL_CONVEYOR_BELT4_SWITCH_RIGHT,	GFX_BELT4_SWITCH_RIGHT	},
-    { EL_LANDMINE,			GFX_LANDMINE		},
-    { EL_ENVELOPE,			GFX_ENVELOPE		},
-    { EL_LIGHT_SWITCH,			GFX_LIGHT_SWITCH_OFF	},
-    { EL_LIGHT_SWITCH_ACTIVE,		GFX_LIGHT_SWITCH_ON	},
-    { EL_SIGN_EXCLAMATION,		GFX_SIGN_EXCLAMATION	},
-    { EL_SIGN_RADIOACTIVITY,		GFX_SIGN_RADIOACTIVITY	},
-    { EL_SIGN_STOP,			GFX_SIGN_STOP		},
-    { EL_SIGN_WHEELCHAIR,		GFX_SIGN_WHEELCHAIR	},
-    { EL_SIGN_PARKING,			GFX_SIGN_PARKING	},
-    { EL_SIGN_ONEWAY,			GFX_SIGN_ONEWAY		},
-    { EL_SIGN_HEART,			GFX_SIGN_HEART		},
-    { EL_SIGN_TRIANGLE,			GFX_SIGN_TRIANGLE	},
-    { EL_SIGN_ROUND,			GFX_SIGN_ROUND		},
-    { EL_SIGN_EXIT,			GFX_SIGN_EXIT		},
-    { EL_SIGN_YINYANG,			GFX_SIGN_YINYANG	},
-    { EL_SIGN_OTHER,			GFX_SIGN_OTHER		},
-    { EL_MOLE_LEFT,			GFX_MOLE_LEFT		},
-    { EL_MOLE_RIGHT,			GFX_MOLE_RIGHT		},
-    { EL_MOLE_UP,			GFX_MOLE_UP		},
-    { EL_MOLE_DOWN,			GFX_MOLE_DOWN		},
-    { EL_STEELWALL_SLANTED,		GFX_STEEL_SLANTED	},
-    { EL_SAND_INVISIBLE,		GFX_SAND_INVISIBLE	},
-    { EL_DX_UNKNOWN_15,			GFX_DX_UNKNOWN_15	},
-    { EL_DX_UNKNOWN_42,			GFX_DX_UNKNOWN_42	},
-    { EL_TIMEGATE_OPEN,			GFX_TIMEGATE_OPEN	},
-    { EL_TIMEGATE_CLOSED,		GFX_TIMEGATE_CLOSED	},
-    { EL_TIMEGATE_SWITCH_ON,		GFX_TIMEGATE_SWITCH	},
-    { EL_TIMEGATE_SWITCH_OFF,		GFX_TIMEGATE_SWITCH	},
-    { EL_BALLOON,			GFX_BALLOON		},
-    { EL_BALLOON_SEND_LEFT,		GFX_BALLOON_SEND_LEFT	},
-    { EL_BALLOON_SEND_RIGHT,		GFX_BALLOON_SEND_RIGHT	},
-    { EL_BALLOON_SEND_UP,		GFX_BALLOON_SEND_UP	},
-    { EL_BALLOON_SEND_DOWN,		GFX_BALLOON_SEND_DOWN	},
-    { EL_BALLOON_SEND_ANY,		GFX_BALLOON_SEND_ANY	},
-    { EL_EMC_STEELWALL1,		GFX_EMC_STEEL_WALL_1	},
-    { EL_EMC_STEELWALL2,		GFX_EMC_STEEL_WALL_2	},
-    { EL_EMC_STEELWALL3,		GFX_EMC_STEEL_WALL_3	},
-    { EL_EMC_STEELWALL4,		GFX_EMC_STEEL_WALL_4	},
-    { EL_EMC_WALL_PILLAR_UPPER,		GFX_EMC_WALL_1		},
-    { EL_EMC_WALL_PILLAR_MIDDLE,	GFX_EMC_WALL_2		},
-    { EL_EMC_WALL_PILLAR_LOWER,		GFX_EMC_WALL_3		},
-    { EL_EMC_WALL4,			GFX_EMC_WALL_4		},
-    { EL_EMC_WALL5,			GFX_EMC_WALL_5		},
-    { EL_EMC_WALL6,			GFX_EMC_WALL_6		},
-    { EL_EMC_WALL7,			GFX_EMC_WALL_7		},
-    { EL_EMC_WALL8,			GFX_EMC_WALL_8		},
-    { EL_TUBE_CROSS,			GFX_TUBE_CROSS		},
-    { EL_TUBE_VERTICAL,			GFX_TUBE_VERTICAL	},
-    { EL_TUBE_HORIZONTAL,		GFX_TUBE_HORIZONTAL	},
-    { EL_TUBE_VERT_LEFT,		GFX_TUBE_VERT_LEFT	},
-    { EL_TUBE_VERT_RIGHT,		GFX_TUBE_VERT_RIGHT	},
-    { EL_TUBE_HORIZ_UP,			GFX_TUBE_HORIZ_UP	},
-    { EL_TUBE_HORIZ_DOWN,		GFX_TUBE_HORIZ_DOWN	},
-    { EL_TUBE_LEFT_UP,			GFX_TUBE_LEFT_UP	},
-    { EL_TUBE_LEFT_DOWN,		GFX_TUBE_LEFT_DOWN	},
-    { EL_TUBE_RIGHT_UP,			GFX_TUBE_RIGHT_UP	},
-    { EL_TUBE_RIGHT_DOWN,		GFX_TUBE_RIGHT_DOWN	},
-    { EL_SPRING,			GFX_SPRING		},
-    { EL_SPRING_MOVING,			GFX_SPRING		},
-    { EL_TRAP_INACTIVE,			GFX_TRAP_INACTIVE	},
-    { EL_TRAP_ACTIVE,			GFX_TRAP_ACTIVE		},
-    { EL_BD_WALL,			GFX_BD_WALL		},
-    { EL_BD_ROCK,			GFX_BD_ROCK		},
-    { EL_DX_SUPABOMB,			GFX_DX_SUPABOMB		},
-    { EL_SP_MURPHY_CLONE,		GFX_SP_MURPHY_CLONE	},
-    { -1,				-1			}
-  };
-
-  static struct
-  {
-    int element;
-    int graphic_left;
-    int graphic_right;
-    int graphic_up;
-    int graphic_down;
-  }
-  element_to_direction_graphic[] =
-  {
-    {
-      EL_SPACESHIP,
-      IMG_SPACESHIP_LEFT,	IMG_SPACESHIP_RIGHT,
-      IMG_SPACESHIP_UP,		IMG_SPACESHIP_DOWN
-    },
-    {
-      EL_BUG,
-      IMG_BUG_LEFT,		IMG_BUG_RIGHT,
-      IMG_BUG_UP,		IMG_BUG_DOWN
-    },
-    {
-      EL_PACMAN,
-      IMG_PACMAN_LEFT,		IMG_PACMAN_RIGHT,
-      IMG_PACMAN_UP,		IMG_PACMAN_DOWN
-    },
-    {
-      EL_PLAYER1,
-      IMG_PLAYER1_LEFT,		IMG_PLAYER1_RIGHT,
-      IMG_PLAYER1_UP,		IMG_PLAYER1_DOWN
-    },
-    {
-      EL_PLAYER2,
-      IMG_PLAYER2_LEFT,		IMG_PLAYER2_RIGHT,
-      IMG_PLAYER2_UP,		IMG_PLAYER2_DOWN
-    },
-    {
-      EL_PLAYER3,
-      IMG_PLAYER3_LEFT,		IMG_PLAYER3_RIGHT,
-      IMG_PLAYER3_UP,		IMG_PLAYER3_DOWN
-    },
-    {
-      EL_PLAYER4,
-      IMG_PLAYER4_LEFT,		IMG_PLAYER4_RIGHT,
-      IMG_PLAYER4_UP,		IMG_PLAYER4_DOWN
-    },
-    {
-      EL_PIG,
-      IMG_PIG_LEFT,		IMG_PIG_RIGHT,
-      IMG_PIG_UP,		IMG_PIG_DOWN
-    },
-    {
-      EL_DRAGON,
-      IMG_DRAGON_LEFT,		IMG_DRAGON_RIGHT,
-      IMG_DRAGON_UP,		IMG_DRAGON_DOWN
-    },
-    {
-      EL_MOLE,
-      IMG_MOLE_LEFT,		IMG_MOLE_RIGHT,
-      IMG_MOLE_UP,		IMG_MOLE_DOWN
-    },
+    for (act=0; act<NUM_ACTIONS; act++)
     {
-      EL_PENGUIN,
-      IMG_PENGUIN_LEFT,		IMG_PENGUIN_RIGHT,
-      IMG_PENGUIN_UP,		IMG_PENGUIN_DOWN
-    },
-    {
-      EL_SP_MURPHY,
-      IMG_SP_MURPHY_LEFT,	IMG_SP_MURPHY_RIGHT,
-      IMG_SP_MURPHY_UP,		IMG_SP_MURPHY_DOWN
-    },
-    {
-      EL_SP_SNIKSNAK,
-      IMG_SP_SNIKSNAK_LEFT,	IMG_SP_SNIKSNAK_RIGHT,
-      IMG_SP_SNIKSNAK_UP,	IMG_SP_SNIKSNAK_DOWN
-    },
-    {
-      -1,
-      -1,			-1,
-      -1,			-1
-    }
-  };
+      element_info[i].graphic[act] = -1;
 
-  /* always start with reliable default values */
-  for(i=0; i<MAX_ELEMENTS; i++)
-  {
-    for(j=0; j<NUM_GFX_ACTIONS_MAPPED; j++)
-    {
-      element_info[i].graphic[j] = GFX_LEERRAUM;
-      element_info[i].has_direction_graphic[j] = FALSE;
+      for (dir=0; dir<NUM_DIRECTIONS; dir++)
+	element_info[i].direction_graphic[act][dir] = -1;
     }
   }
 
   for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
-    element_info[i].graphic[GFX_ACTION_DEFAULT] =
-      GFX_CHAR_START + (i - EL_CHAR_START);
+    element_info[i].graphic[ACTION_DEFAULT] =
+      IMG_CHAR_START + (i - EL_CHAR_START);
 
-  for (i=EL_SP_START; i<=EL_SP_END; i++)
-  {
-    int nr_element = i - EL_SP_START;
-    int gfx_per_line = 8;
-    int nr_graphic =
-      (nr_element / gfx_per_line) * SP_PER_LINE +
-      (nr_element % gfx_per_line);
+  for (i=EL_CUSTOM_START; i<=EL_CUSTOM_END; i++)
+    element_info[i].graphic[ACTION_DEFAULT] =
+      IMG_CUSTOM_START + (i - EL_CUSTOM_START);
 
-    element_info[i].graphic[GFX_ACTION_DEFAULT] =
-      GFX_START_ROCKSSP + nr_graphic;
-  }
-
-  /* this overrides some of the above default settings (GFX_SP_ZONK etc.) */
   i = 0;
   while (element_to_graphic[i].element > -1)
   {
-    int element = element_to_graphic[i].element;
-    int graphic = element_to_graphic[i].graphic;
+    int element   = element_to_graphic[i].element;
+    int direction = element_to_graphic[i].direction;
+    int action    = element_to_graphic[i].action;
+    int graphic   = element_to_graphic[i].graphic;
+
+    if (action < 0)
+      action = ACTION_DEFAULT;
+
+    if (direction > -1)
+    {
+      direction = MV_DIR_BIT(direction);
+
+      element_info[element].direction_graphic[action][direction] = graphic;
+    }
+    else
+      element_info[element].graphic[action] = graphic;
 
-    element_info[element].graphic[GFX_ACTION_DEFAULT] = graphic;
     i++;
   }
 
-  /* this initializes special graphics for left/right/up/down directions */
-  i = 0;
-  while (element_to_direction_graphic[i].element > -1)
+  /* now set all '-1' values to element specific default values */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    int element = element_to_direction_graphic[i].element;
+    int default_action_graphic = element_info[i].graphic[ACTION_DEFAULT];
+    int default_action_direction_graphic[NUM_DIRECTIONS];
 
-    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_LEFT] =
-      element_to_direction_graphic[i].graphic_left;
-    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_RIGHT] =
-      element_to_direction_graphic[i].graphic_right;
-    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_UP] =
-      element_to_direction_graphic[i].graphic_up;
-    element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_DOWN] =
-      element_to_direction_graphic[i].graphic_down;
+    if (default_action_graphic == -1)
+      default_action_graphic = IMG_CHAR_QUESTION;
 
-    element_info[element].has_direction_graphic[GFX_ACTION_DEFAULT] = TRUE;
-    i++;
+    for (dir=0; dir<NUM_DIRECTIONS; dir++)
+    {
+      default_action_direction_graphic[dir] =
+	element_info[i].direction_graphic[ACTION_DEFAULT][dir];
+
+      if (default_action_direction_graphic[dir] == -1)
+	default_action_direction_graphic[dir] = default_action_graphic;
+    }
+
+    for (act=0; act<NUM_ACTIONS; act++)
+    {
+      for (dir=0; dir<NUM_DIRECTIONS; dir++)
+      {
+	int default_direction_graphic = element_info[i].graphic[act];
+
+	/* no graphic for current action -- use default direction graphic */
+	if (default_direction_graphic == -1)
+	  default_direction_graphic = default_action_direction_graphic[dir];
+
+	if (element_info[i].direction_graphic[act][dir] == -1)
+	  element_info[i].direction_graphic[act][dir] =
+	    default_direction_graphic;
+      }
+
+      /* no graphic for this specific action -- use default action graphic */
+      if (element_info[i].graphic[act] == -1)
+	element_info[i].graphic[act] = default_action_graphic;
+    }
   }
 }
 
+static void set_graphic_parameters(int graphic, int *parameter)
+{
+  Bitmap *src_bitmap = getBitmapFromImageID(graphic);
+  int num_xtiles = (src_bitmap ? src_bitmap->width          : TILEX) / TILEX;
+  int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY;
+
+  graphic_info[graphic].bitmap = src_bitmap;
+
+  graphic_info[graphic].src_x = parameter[GFX_ARG_XPOS] * TILEX;
+  graphic_info[graphic].src_y = parameter[GFX_ARG_YPOS] * TILEY;
+  graphic_info[graphic].offset_x = parameter[GFX_ARG_OFFSET];
+  graphic_info[graphic].offset_y = 0;
+
+  /* animation frames are ordered vertically instead of horizontally */
+  if (parameter[GFX_ARG_VERTICAL])
+  {
+    graphic_info[graphic].offset_x = 0;
+    graphic_info[graphic].offset_y = parameter[GFX_ARG_OFFSET];
+  }
+
+  /* optionally, the x and y offset of frames can be specified directly */
+  if (parameter[GFX_ARG_XOFFSET] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].offset_x = parameter[GFX_ARG_XOFFSET];
+  if (parameter[GFX_ARG_YOFFSET] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].offset_y = parameter[GFX_ARG_YOFFSET];
+
+  /* automatically determine correct number of frames, if not defined */
+  if (parameter[GFX_ARG_FRAMES] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].anim_frames = parameter[GFX_ARG_FRAMES];
+  else if (parameter[GFX_ARG_XPOS] == 0 && !parameter[GFX_ARG_VERTICAL])
+    graphic_info[graphic].anim_frames =	num_xtiles;
+  else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL])
+    graphic_info[graphic].anim_frames =	num_ytiles;
+  else
+    graphic_info[graphic].anim_frames = 1;
+
+  graphic_info[graphic].anim_delay = parameter[GFX_ARG_DELAY];
+  if (graphic_info[graphic].anim_delay == 0)	/* delay must be at least 1 */
+    graphic_info[graphic].anim_delay = 1;
+
+  /* set mode for animation frame order */
+  if (parameter[GFX_ARG_MODE_LOOP])
+    graphic_info[graphic].anim_mode = ANIM_LOOP;
+  else if (parameter[GFX_ARG_MODE_LINEAR])
+    graphic_info[graphic].anim_mode = ANIM_LINEAR;
+  else if (parameter[GFX_ARG_MODE_PINGPONG])
+    graphic_info[graphic].anim_mode = ANIM_PINGPONG;
+  else if (parameter[GFX_ARG_MODE_PINGPONG2])
+    graphic_info[graphic].anim_mode = ANIM_PINGPONG2;
+  else if (parameter[GFX_ARG_MODE_RANDOM])
+    graphic_info[graphic].anim_mode = ANIM_RANDOM;
+  else if (graphic_info[graphic].anim_frames > 1)
+    graphic_info[graphic].anim_mode = ANIM_LOOP;
+  else
+    graphic_info[graphic].anim_mode = ANIM_NONE;
+
+  /* set additional flag to play animation frames in reverse order */
+  if (parameter[GFX_ARG_MODE_REVERSE])
+    graphic_info[graphic].anim_mode |= ANIM_REVERSE;
+
+  /* automatically determine correct start frame, if not defined */
+  if (parameter[GFX_ARG_START_FRAME] == ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].anim_start_frame = 0;
+  else if (graphic_info[graphic].anim_mode & ANIM_REVERSE)
+    graphic_info[graphic].anim_start_frame =
+      graphic_info[graphic].anim_frames - parameter[GFX_ARG_START_FRAME] - 1;
+  else
+    graphic_info[graphic].anim_start_frame = parameter[GFX_ARG_START_FRAME];
+
+  /* animation synchronized with global frame counter, not move position */
+  graphic_info[graphic].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
+}
+
 static void InitGraphicInfo()
 {
+  static boolean clipmasks_initialized = FALSE;
   int i;
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  Pixmap src_pixmap;
+  XGCValues clip_gc_values;
+  unsigned long clip_gc_valuemask;
+  GC copy_clipmask_gc = None;
+#endif
 
   image_files = getCurrentImageList();
 
-  for(i=0; i<MAX_GRAPHICS; i++)
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  if (clipmasks_initialized)
   {
-    /* always start with reliable default values */
-    graphic_info[i].bitmap = NULL;
-    graphic_info[i].src_x = 0;
-    graphic_info[i].src_y = 0;
+    for (i=0; i<NUM_IMAGE_FILES; i++)
+    {
+      if (graphic_info[i].clip_mask)
+	XFreePixmap(display, graphic_info[i].clip_mask);
+      if (graphic_info[i].clip_gc)
+	XFreeGC(display, graphic_info[i].clip_gc);
 
-    getGraphicSource(i, &graphic_info[i].bitmap,
-		     &graphic_info[i].src_x, &graphic_info[i].src_y);
+      graphic_info[i].clip_mask = None;
+      graphic_info[i].clip_gc = None;
+    }
   }
+#endif
 
-  for(i=0; i<NUM_IMAGE_FILES; i++)
+  for (i=0; i<NUM_IMAGE_FILES; i++)
   {
-    int *parameter = image_files[i].parameter;
+    Bitmap *src_bitmap;
+    int src_x, src_y;
+    int first_frame, last_frame;
 
-    /* always start with reliable default values */
-    new_graphic_info[i].bitmap = getBitmapFromImageID(i);
-    new_graphic_info[i].src_x = parameter[GFX_ARG_XPOS] * TILEX;
-    new_graphic_info[i].src_y = parameter[GFX_ARG_YPOS] * TILEY;
+    set_graphic_parameters(i, image_files[i].parameter);
 
-    new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
+    /* now check if no animation frames are outside of the loaded image */
 
-    new_graphic_info[i].anim_delay = parameter[GFX_ARG_DELAY];
-    if (new_graphic_info[i].anim_delay == 0)	/* delay must be at least 1 */
-      new_graphic_info[i].anim_delay = 1;
+    if (graphic_info[i].bitmap == NULL)
+      continue;		/* skip check for optional images that are undefined */
 
-    /* basically, animation can be either normal or reverse direction */
-    if (parameter[GFX_ARG_REVERSE])
-      new_graphic_info[i].anim_mode = ANIM_REVERSE;
-    else
-      new_graphic_info[i].anim_mode = ANIM_NORMAL;
+    first_frame = 0;
+    getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
+    if (src_x < 0 || src_y < 0 ||
+	src_x + TILEX > src_bitmap->width ||
+	src_y + TILEY > src_bitmap->height)
+    {
+      Error(ERR_RETURN_LINE, "-");
+      Error(ERR_RETURN, "warning: error found in config file:");
+      Error(ERR_RETURN, "- config file: '%s'",
+	    getImageConfigFilename());
+      Error(ERR_RETURN, "- config token: '%s'",
+	    getTokenFromImageID(i));
+      Error(ERR_RETURN, "- image file: '%s'",
+	    src_bitmap->source_filename);
+      Error(ERR_RETURN,
+	    "error: first animation frame out of bounds (%d, %d)",
+	    src_x, src_y);
+      Error(ERR_RETURN, "custom graphic rejected for this element/action");
+      Error(ERR_RETURN_LINE, "-");
+
+      set_graphic_parameters(i, image_files[i].default_parameter);
+    }
 
-    /* additionally, animation can be either pingpong or pingpong2 layout */
-    if (parameter[GFX_ARG_PINGPONG])
-      new_graphic_info[i].anim_mode |= ANIM_PINGPONG;
-    else if (parameter[GFX_ARG_PINGPONG2])
-      new_graphic_info[i].anim_mode |= ANIM_PINGPONG2;
+    last_frame = graphic_info[i].anim_frames - 1;
+    getGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y);
+    if (src_x < 0 || src_y < 0 ||
+	src_x + TILEX > src_bitmap->width ||
+	src_y + TILEY > src_bitmap->height)
+    {
+      Error(ERR_RETURN_LINE, "-");
+      Error(ERR_RETURN, "warning: error found in config file:");
+      Error(ERR_RETURN, "- config file: '%s'",
+	    getImageConfigFilename());
+      Error(ERR_RETURN, "- config token: '%s'",
+	    getTokenFromImageID(i));
+      Error(ERR_RETURN, "- image file: '%s'",
+	    src_bitmap->source_filename);
+      Error(ERR_RETURN,
+	    "error: last animation frame (%d) out of bounds (%d, %d)",
+	    last_frame, src_x, src_y);
+      Error(ERR_RETURN, "custom graphic rejected for this element/action");
+      Error(ERR_RETURN_LINE, "-");
+
+      set_graphic_parameters(i, image_files[i].default_parameter);
+    }
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+    /* currently we need only a tile clip mask from the first frame */
+    getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
+
+    if (copy_clipmask_gc == None)
+    {
+      clip_gc_values.graphics_exposures = False;
+      clip_gc_valuemask = GCGraphicsExposures;
+      copy_clipmask_gc = XCreateGC(display, src_bitmap->clip_mask,
+				   clip_gc_valuemask, &clip_gc_values);
+    }
 
-    /* animation synchronized with global frame counter, not move position */
-    new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
+    graphic_info[i].clip_mask =
+      XCreatePixmap(display, window->drawable, TILEX, TILEY, 1);
 
-    new_graphic_info[i].anim_vertical = parameter[GFX_ARG_VERTICAL];
+    src_pixmap = src_bitmap->clip_mask;
+    XCopyArea(display, src_pixmap, graphic_info[i].clip_mask,
+	      copy_clipmask_gc, src_x, src_y, TILEX, TILEY, 0, 0);
+
+    clip_gc_values.graphics_exposures = False;
+    clip_gc_values.clip_mask = graphic_info[i].clip_mask;
+    clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
+    graphic_info[i].clip_gc =
+      XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
+#endif
   }
 
-#if 0
-  printf("D> %d\n", image_files[GFX_BD_DIAMOND].parameter[GFX_ARG_NUM_FRAMES]);
-  printf("W> %d\n", image_files[GFX_ROBOT_WHEEL].parameter[GFX_ARG_NUM_FRAMES]);
-
-  graphic_info[GFX_ABLENK].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
-  graphic_info[GFX_ABLENK].src_x = 0;
-  graphic_info[GFX_ABLENK].src_y = 0;
-
-  graphic_info[GFX_ABLENK + 1].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
-  graphic_info[GFX_ABLENK + 2].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
-  graphic_info[GFX_ABLENK + 3].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL);
-  graphic_info[GFX_ABLENK + 1].src_x = 1 * TILEX;
-  graphic_info[GFX_ABLENK + 2].src_x = 2 * TILEX;
-  graphic_info[GFX_ABLENK + 3].src_x = 3 * TILEX;
-  graphic_info[GFX_ABLENK + 1].src_y = 0;
-  graphic_info[GFX_ABLENK + 2].src_y = 0;
-  graphic_info[GFX_ABLENK + 3].src_y = 0;
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  if (copy_clipmask_gc)
+    XFreeGC(display, copy_clipmask_gc);
 #endif
+
+  clipmasks_initialized = TRUE;
+}
+
+static void set_sound_parameters(int sound, int *parameter)
+{
+  /* explicit loop mode setting in configuration overrides default value */
+  if (parameter[SND_ARG_MODE_LOOP] != ARG_UNDEFINED_VALUE)
+    sound_info[sound].loop = parameter[SND_ARG_MODE_LOOP];
 }
 
 static void InitSoundInfo()
 {
+  int sound_effect_properties[NUM_SOUND_FILES];
+  int i, j;
+
   sound_files = getCurrentSoundList();
 
-  /* initialize sound effect lookup table for element actions */
-  InitGameSound();
+  /* initialize sound effect for all elements to "no sound" */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+    for (j=0; j<NUM_ACTIONS; j++)
+      element_info[i].sound[j] = SND_UNDEFINED;
+
+  for (i=0; i<NUM_SOUND_FILES; i++)
+  {
+    int len_effect_text = strlen(sound_files[i].token);
+
+    sound_effect_properties[i] = ACTION_OTHER;
+    sound_info[i].loop = FALSE;
+
+    /* determine all loop sounds and identify certain sound classes */
+
+    for (j=0; element_action_info[j].suffix; j++)
+    {
+      int len_action_text = strlen(element_action_info[j].suffix);
+
+      if (len_action_text < len_effect_text &&
+	  strcmp(&sound_files[i].token[len_effect_text - len_action_text],
+		 element_action_info[j].suffix) == 0)
+      {
+	sound_effect_properties[i] = element_action_info[j].value;
+
+	if (element_action_info[j].is_loop_sound)
+	  sound_info[i].loop = TRUE;
+      }
+    }
+
+    /* associate elements and some selected sound actions */
+
+    for (j=0; j<MAX_NUM_ELEMENTS; j++)
+    {
+      if (element_info[j].sound_class_name)
+      {
+	int len_class_text = strlen(element_info[j].sound_class_name);
+
+	if (len_class_text + 1 < len_effect_text &&
+	    strncmp(sound_files[i].token,
+		    element_info[j].sound_class_name, len_class_text) == 0 &&
+	    sound_files[i].token[len_class_text] == '.')
+	{
+	  int sound_action_value = sound_effect_properties[i];
+
+	  element_info[j].sound[sound_action_value] = i;
+	}
+      }
+    }
+
+    set_sound_parameters(i, sound_files[i].parameter);
+  }
+
+#if 0
+  /* TEST ONLY */
+  {
+    int element = EL_SAND;
+    int sound_action = ACTION_DIGGING;
+    int j = 0;
+
+    while (element_action_info[j].suffix)
+    {
+      if (element_action_info[j].value == sound_action)
+	printf("element %d, sound action '%s'  == %d\n",
+	       element, element_action_info[j].suffix,
+	       element_info_[element].sound[sound_action]);
+      j++;
+    }
+  }
+#endif
 }
 
 void InitElementProperties()
@@ -1103,13 +1121,13 @@ void InitElementProperties()
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
-    EL_TUBE_CROSS,
+    EL_TUBE_ALL,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERT_LEFT,
-    EL_TUBE_VERT_RIGHT,
-    EL_TUBE_HORIZ_UP,
-    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
@@ -1128,7 +1146,7 @@ void InitElementProperties()
     EL_BD_WALL,
     EL_WALL_CRUMBLED,
     EL_EXIT_CLOSED,
-    EL_AUSGANG_ACT,
+    EL_EXIT_OPENING,
     EL_EXIT_OPEN,
     EL_AMOEBA_DEAD,
     EL_AMOEBA_WET,
@@ -1140,17 +1158,17 @@ void InitElementProperties()
     EL_QUICKSAND_FILLING,
     EL_QUICKSAND_EMPTYING,
     EL_MAGIC_WALL,
-    EL_MAGIC_WALL_EMPTY,
+    EL_MAGIC_WALL_ACTIVE,
     EL_MAGIC_WALL_EMPTYING,
     EL_MAGIC_WALL_FILLING,
     EL_MAGIC_WALL_FULL,
     EL_MAGIC_WALL_DEAD,
-    EL_MAGIC_WALL_BD_OFF,
-    EL_MAGIC_WALL_BD_EMPTY,
-    EL_MAGIC_WALL_BD_EMPTYING,
-    EL_MAGIC_WALL_BD_FULL,
-    EL_MAGIC_WALL_BD_FILLING,
-    EL_MAGIC_WALL_BD_DEAD,
+    EL_BD_MAGIC_WALL,
+    EL_BD_MAGIC_WALL_ACTIVE,
+    EL_BD_MAGIC_WALL_EMPTYING,
+    EL_BD_MAGIC_WALL_FULL,
+    EL_BD_MAGIC_WALL_FILLING,
+    EL_BD_MAGIC_WALL_DEAD,
     EL_GAMEOFLIFE,
     EL_BIOMAZE,
     EL_ACIDPOOL_TOPLEFT,
@@ -1177,7 +1195,11 @@ void InitElementProperties()
     EL_SP_TERMINAL,
     EL_SP_TERMINAL_ACTIVE,
     EL_SP_EXIT_CLOSED,
+    EL_SP_EXIT_OPEN,
     EL_INVISIBLE_STEELWALL,
+    EL_INVISIBLE_STEELWALL_ACTIVE,
+    EL_INVISIBLE_WALL,
+    EL_INVISIBLE_WALL_ACTIVE,
     EL_CONVEYOR_BELT1_SWITCH_LEFT,
     EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
     EL_CONVEYOR_BELT1_SWITCH_RIGHT,
@@ -1194,8 +1216,8 @@ void InitElementProperties()
     EL_SWITCHGATE_SWITCH_DOWN,
     EL_LIGHT_SWITCH,
     EL_LIGHT_SWITCH_ACTIVE,
-    EL_TIMEGATE_SWITCH_OFF,
-    EL_TIMEGATE_SWITCH_ON,
+    EL_TIMEGATE_SWITCH,
+    EL_TIMEGATE_SWITCH_ACTIVE,
     EL_SIGN_EXCLAMATION,
     EL_SIGN_RADIOACTIVITY,
     EL_SIGN_STOP,
@@ -1248,13 +1270,13 @@ void InitElementProperties()
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
-    EL_TUBE_CROSS,
+    EL_TUBE_ALL,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERT_LEFT,
-    EL_TUBE_VERT_RIGHT,
-    EL_TUBE_HORIZ_UP,
-    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
@@ -1283,6 +1305,7 @@ void InitElementProperties()
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
     EL_INVISIBLE_STEELWALL,
+    EL_INVISIBLE_STEELWALL_ACTIVE,
     EL_CONVEYOR_BELT1_SWITCH_LEFT,
     EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
     EL_CONVEYOR_BELT1_SWITCH_RIGHT,
@@ -1339,13 +1362,13 @@ void InitElementProperties()
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
-    EL_TUBE_CROSS,
+    EL_TUBE_ALL,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERT_LEFT,
-    EL_TUBE_VERT_RIGHT,
-    EL_TUBE_HORIZ_UP,
-    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
@@ -1394,8 +1417,8 @@ void InitElementProperties()
   {
     EL_BUG,
     EL_SPACESHIP,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
     EL_YAMYAM,
     EL_DARK_YAMYAM,
     EL_ROBOT,
@@ -1425,7 +1448,7 @@ void InitElementProperties()
     EL_EM_GATE3_GRAY,
     EL_EM_GATE4_GRAY,
     EL_EXIT_CLOSED,
-    EL_AUSGANG_ACT,
+    EL_EXIT_OPENING,
     EL_EXIT_OPEN,
     EL_WALL,
     EL_WALL_CRUMBLED,
@@ -1433,7 +1456,7 @@ void InitElementProperties()
     EL_WALL_GROWING_X,
     EL_WALL_GROWING_Y,
     EL_WALL_GROWING_XY,
-    EL_MAUERND,
+    EL_WALL_GROWING_ACTIVE,
     EL_BD_WALL,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
@@ -1454,7 +1477,11 @@ void InitElementProperties()
     EL_SP_TERMINAL,
     EL_SP_TERMINAL_ACTIVE,
     EL_SP_EXIT_CLOSED,
+    EL_SP_EXIT_OPEN,
     EL_INVISIBLE_STEELWALL,
+    EL_INVISIBLE_STEELWALL_ACTIVE,
+    EL_INVISIBLE_WALL,
+    EL_INVISIBLE_WALL_ACTIVE,
     EL_STEELWALL_SLANTED,
     EL_EMC_STEELWALL1,
     EL_EMC_STEELWALL2,
@@ -1486,7 +1513,7 @@ void InitElementProperties()
     EL_AMOEBA_DROP,
     EL_QUICKSAND_FULL,
     EL_MAGIC_WALL_FULL,
-    EL_MAGIC_WALL_BD_FULL,
+    EL_BD_MAGIC_WALL_FULL,
     EL_TIME_ORB_FULL,
     EL_TIME_ORB_EMPTY,
     EL_SP_ZONK,
@@ -1549,8 +1576,8 @@ void InitElementProperties()
   {
     EL_BUG,
     EL_SPACESHIP,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
     EL_YAMYAM,
     EL_DARK_YAMYAM,
     EL_ROBOT,
@@ -1563,7 +1590,7 @@ void InitElementProperties()
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
     EL_BALLOON,
-    EL_SPRING_MOVING
+    EL_SPRING
   };
   static int ep_can_move_num = SIZEOF_ARRAY_INT(ep_can_move);
 
@@ -1577,14 +1604,14 @@ void InitElementProperties()
     EL_SPACESHIP_UP,
     EL_SPACESHIP_LEFT,
     EL_SPACESHIP_DOWN,
-    EL_BUTTERFLY_RIGHT,
-    EL_BUTTERFLY_UP,
-    EL_BUTTERFLY_LEFT,
-    EL_BUTTERFLY_DOWN,
-    EL_FIREFLY_RIGHT,
-    EL_FIREFLY_UP,
-    EL_FIREFLY_LEFT,
-    EL_FIREFLY_DOWN,
+    EL_BD_BUTTERFLY_RIGHT,
+    EL_BD_BUTTERFLY_UP,
+    EL_BD_BUTTERFLY_LEFT,
+    EL_BD_BUTTERFLY_DOWN,
+    EL_BD_FIREFLY_RIGHT,
+    EL_BD_FIREFLY_UP,
+    EL_BD_FIREFLY_LEFT,
+    EL_BD_FIREFLY_DOWN,
     EL_PACMAN_RIGHT,
     EL_PACMAN_UP,
     EL_PACMAN_LEFT,
@@ -1596,8 +1623,8 @@ void InitElementProperties()
   {
     EL_BUG,
     EL_SPACESHIP,
-    EL_BUTTERFLY,
-    EL_FIREFLY
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY
   };
   static int ep_dont_touch_num = SIZEOF_ARRAY_INT(ep_dont_touch);
 
@@ -1605,8 +1632,8 @@ void InitElementProperties()
   {
     EL_BUG,
     EL_SPACESHIP,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
     EL_YAMYAM,
     EL_DARK_YAMYAM,
     EL_ROBOT,
@@ -1615,7 +1642,7 @@ void InitElementProperties()
     EL_ACID,
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
-    EL_SP_BUG_ACTIVE,
+    EL_SP_BUGGY_BASE_ACTIVE,
     EL_TRAP_ACTIVE,
     EL_LANDMINE
   };
@@ -1626,8 +1653,8 @@ void InitElementProperties()
     EL_SAND,
     EL_BUG,
     EL_SPACESHIP,
-    EL_BUTTERFLY,
-    EL_FIREFLY,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
     EL_YAMYAM,
     EL_ROBOT,
     EL_PACMAN,
@@ -1657,21 +1684,21 @@ void InitElementProperties()
     EL_ROCK,
     EL_BD_ROCK,
     EL_BD_DIAMOND,
-    EL_MAGIC_WALL_BD_OFF,
+    EL_BD_MAGIC_WALL,
     EL_EXIT_CLOSED,
     EL_EXIT_OPEN,
     EL_STEELWALL,
-    EL_PLAYER,
-    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_PLAYER1,
+    EL_BD_FIREFLY,
+    EL_BD_FIREFLY_1,
+    EL_BD_FIREFLY_2,
+    EL_BD_FIREFLY_3,
+    EL_BD_FIREFLY_4,
+    EL_BD_BUTTERFLY,
+    EL_BD_BUTTERFLY_1,
+    EL_BD_BUTTERFLY_2,
+    EL_BD_BUTTERFLY_3,
+    EL_BD_BUTTERFLY_4,
     EL_BD_AMOEBA,
     EL_CHAR_QUESTION
   };
@@ -1681,10 +1708,10 @@ void InitElementProperties()
   {
     EL_EMPTY,
     EL_STEELWALL,
-    EL_SOKOBAN_OBJEKT,
-    EL_SOKOBAN_FELD_LEER,
-    EL_SOKOBAN_FELD_VOLL,
-    EL_PLAYER,
+    EL_SOKOBAN_OBJECT,
+    EL_SOKOBAN_FIELD_EMPTY,
+    EL_SOKOBAN_FIELD_FULL,
+    EL_PLAYER1,
     EL_INVISIBLE_STEELWALL
   };
   static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element);
@@ -1707,7 +1734,6 @@ void InitElementProperties()
     EL_WALL,
     EL_BD_WALL,
     EL_WALL_CRUMBLED,
-    EL_KEY,
     EL_STEELWALL,
     EL_AMOEBA_DEAD,
     EL_QUICKSAND_EMPTY,
@@ -1738,7 +1764,9 @@ void InitElementProperties()
     EL_EM_GATE3_GRAY,
     EL_EM_GATE4_GRAY,
     EL_DYNAMITE,
+    EL_INVISIBLE_STEELWALL,
     EL_INVISIBLE_WALL,
+    EL_INVISIBLE_SAND,
     EL_LAMP,
     EL_LAMP_ACTIVE,
     EL_WALL_EMERALD,
@@ -1748,9 +1776,9 @@ void InitElementProperties()
     EL_DYNABOMB_NR,
     EL_DYNABOMB_SZ,
     EL_DYNABOMB_XL,
-    EL_SOKOBAN_OBJEKT,
-    EL_SOKOBAN_FELD_LEER,
-    EL_SOKOBAN_FELD_VOLL,
+    EL_SOKOBAN_OBJECT,
+    EL_SOKOBAN_FIELD_EMPTY,
+    EL_SOKOBAN_FIELD_FULL,
     EL_WALL_EMERALD_RED,
     EL_WALL_EMERALD_PURPLE,
     EL_ACIDPOOL_TOPLEFT,
@@ -1760,8 +1788,8 @@ void InitElementProperties()
     EL_ACIDPOOL_BOTTOMRIGHT,
     EL_MAGIC_WALL,
     EL_MAGIC_WALL_DEAD,
-    EL_MAGIC_WALL_BD_OFF,
-    EL_MAGIC_WALL_BD_DEAD,
+    EL_BD_MAGIC_WALL,
+    EL_BD_MAGIC_WALL_DEAD,
     EL_AMOEBA_TO_DIAMOND,
     EL_BLOCKED,
     EL_SP_EMPTY,
@@ -1795,8 +1823,6 @@ void InitElementProperties()
     EL_SP_HARD_BASE4,
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
-    EL_SP_EXIT_CLOSED,
-    EL_INVISIBLE_STEELWALL,
     EL_CONVEYOR_BELT1_SWITCH_LEFT,
     EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
     EL_CONVEYOR_BELT1_SWITCH_RIGHT,
@@ -1842,10 +1868,10 @@ void InitElementProperties()
     EL_BOMB,
     EL_DYNAMITE_ACTIVE,
     EL_DYNAMITE,
-    EL_DYNABOMB_ACTIVE_1,
-    EL_DYNABOMB_ACTIVE_2,
-    EL_DYNABOMB_ACTIVE_3,
-    EL_DYNABOMB_ACTIVE_4,
+    EL_DYNABOMB_PLAYER1_ACTIVE,
+    EL_DYNABOMB_PLAYER2_ACTIVE,
+    EL_DYNABOMB_PLAYER3_ACTIVE,
+    EL_DYNABOMB_PLAYER4_ACTIVE,
     EL_DYNABOMB_NR,
     EL_DYNABOMB_SZ,
     EL_DYNABOMB_XL,
@@ -1884,8 +1910,8 @@ void InitElementProperties()
     EL_BOMB,
     EL_NUT,
     EL_TIME_ORB_EMPTY,
-    EL_SOKOBAN_FELD_VOLL,
-    EL_SOKOBAN_OBJEKT,
+    EL_SOKOBAN_FIELD_FULL,
+    EL_SOKOBAN_OBJECT,
     EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_DISK_ORANGE,
@@ -1898,7 +1924,6 @@ void InitElementProperties()
 
   static int ep_player[] =
   {
-    EL_PLAYER,
     EL_PLAYER1,
     EL_PLAYER2,
     EL_PLAYER3,
@@ -1920,9 +1945,11 @@ void InitElementProperties()
   {
     EL_SAND,
     EL_SP_BASE,
-    EL_SP_BUG,
-    EL_TRAP_INACTIVE,
-    EL_SAND_INVISIBLE
+    EL_SP_BUGGY_BASE,
+    EL_SP_BUGGY_BASE_ACTIVATING,
+    EL_TRAP,
+    EL_INVISIBLE_SAND,
+    EL_INVISIBLE_SAND_ACTIVE
   };
   static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable);
 
@@ -1936,6 +1963,7 @@ void InitElementProperties()
     EL_SP_CHIP_SINGLE,
     EL_SP_HARD_GRAY,
     EL_SP_EXIT_CLOSED,
+    EL_SP_EXIT_OPEN,
     EL_SP_DISK_ORANGE,
     EL_SP_PORT1_RIGHT,
     EL_SP_PORT1_DOWN,
@@ -1953,7 +1981,7 @@ void InitElementProperties()
     EL_SP_PORT_X,
     EL_SP_PORT_XY,
     EL_SP_ELECTRON,
-    EL_SP_BUG,
+    EL_SP_BUGGY_BASE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
     EL_SP_HARD_BASE1,
@@ -2014,13 +2042,13 @@ void InitElementProperties()
     EL_SP_PORT_X,
     EL_SP_PORT_Y,
     EL_SP_PORT_XY,
-    EL_TUBE_CROSS,
+    EL_TUBE_ALL,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERT_LEFT,
-    EL_TUBE_VERT_RIGHT,
-    EL_TUBE_HORIZ_UP,
-    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
@@ -2031,10 +2059,10 @@ void InitElementProperties()
   static int ep_active_bomb[] =
   {
     EL_DYNAMITE_ACTIVE,
-    EL_DYNABOMB_ACTIVE_1,
-    EL_DYNABOMB_ACTIVE_2,
-    EL_DYNABOMB_ACTIVE_3,
-    EL_DYNABOMB_ACTIVE_4
+    EL_DYNABOMB_PLAYER1_ACTIVE,
+    EL_DYNABOMB_PLAYER2_ACTIVE,
+    EL_DYNABOMB_PLAYER3_ACTIVE,
+    EL_DYNABOMB_PLAYER4_ACTIVE
   };
   static int ep_active_bomb_num = SIZEOF_ARRAY_INT(ep_active_bomb);
 
@@ -2055,6 +2083,23 @@ void InitElementProperties()
   };
   static int ep_belt_num = SIZEOF_ARRAY_INT(ep_belt);
 
+  static int ep_belt_active[] =
+  {
+    EL_CONVEYOR_BELT1_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT1_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT1_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT2_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT2_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT2_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT3_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT3_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT3_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT4_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT4_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT4_RIGHT_ACTIVE,
+  };
+  static int ep_belt_active_num = SIZEOF_ARRAY_INT(ep_belt_active);
+
   static int ep_belt_switch[] =
   {
     EL_CONVEYOR_BELT1_SWITCH_LEFT,
@@ -2074,13 +2119,13 @@ void InitElementProperties()
 
   static int ep_tube[] =
   {
-    EL_TUBE_CROSS,
+    EL_TUBE_ALL,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERT_LEFT,
-    EL_TUBE_VERT_RIGHT,
-    EL_TUBE_HORIZ_UP,
-    EL_TUBE_HORIZ_DOWN,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
     EL_TUBE_LEFT_UP,
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
@@ -2125,6 +2170,7 @@ void InitElementProperties()
   static long ep2_bit[] =
   {
     EP_BIT_BELT,
+    EP_BIT_BELT_ACTIVE,
     EP_BIT_BELT_SWITCH,
     EP_BIT_TUBE
   };
@@ -2165,6 +2211,7 @@ void InitElementProperties()
   static int *ep2_array[] =
   {
     ep_belt,
+    ep_belt_active,
     ep_belt_switch,
     ep_tube
   };
@@ -2205,32 +2252,33 @@ void InitElementProperties()
   static int *ep2_num[] =
   {
     &ep_belt_num,
+    &ep_belt_active_num,
     &ep_belt_switch_num,
     &ep_tube_num
   };
   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++)
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    Elementeigenschaften1[i] = 0;
-    Elementeigenschaften2[i] = 0;
+    Properties1[i] = 0;
+    Properties2[i] = 0;
   }
 
-  for(i=0; i<num_properties1; i++)
-    for(j=0; j<*(ep1_num[i]); j++)
-      Elementeigenschaften1[(ep1_array[i])[j]] |= ep1_bit[i];
-  for(i=0; i<num_properties2; i++)
-    for(j=0; j<*(ep2_num[i]); j++)
-      Elementeigenschaften2[(ep2_array[i])[j]] |= ep2_bit[i];
+  for (i=0; i<num_properties1; i++)
+    for (j=0; j<*(ep1_num[i]); j++)
+      Properties1[(ep1_array[i])[j]] |= ep1_bit[i];
+  for (i=0; i<num_properties2; i++)
+    for (j=0; j<*(ep2_num[i]); j++)
+      Properties2[(ep2_array[i])[j]] |= ep2_bit[i];
 
-  for(i=EL_CHAR_START; i<=EL_CHAR_END; i++)
-    Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
+  for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
+    Properties1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
 }
 
-void Execute_Debug_Command(char *command)
+void Execute_Command(char *command)
 {
-  if (strcmp(command, "create graphicsinfo.conf") == 0)
+  if (strcmp(command, "print graphicsinfo.conf") == 0)
   {
     int i;
 
@@ -2246,8 +2294,10 @@ void Execute_Debug_Command(char *command)
       printf("# %s\n",
 	     getFormattedSetupEntry(image_config[i].token,
 				    image_config[i].value));
+
+    exit(0);
   }
-  else if (strcmp(command, "create soundsinfo.conf") == 0)
+  else if (strcmp(command, "print soundsinfo.conf") == 0)
   {
     int i;
 
@@ -2263,38 +2313,75 @@ void Execute_Debug_Command(char *command)
       printf("# %s\n",
 	     getFormattedSetupEntry(sound_config[i].token,
 				    sound_config[i].value));
+
+    exit(0);
   }
-  else if (strcmp(command, "create musicinfo.conf") == 0)
+  else if (strcmp(command, "print musicinfo.conf") == 0)
   {
     printf("# (Currently only \"name\" and \"sort_priority\" recognized.)\n");
     printf("\n");
     printf("%s\n", getFormattedSetupEntry("name", "Classic Music"));
     printf("\n");
     printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+
+    exit(0);
+  }
+  else if (strncmp(command, "dump level ", 11) == 0)
+  {
+    char *filename = &command[11];
+
+    if (access(filename, F_OK) != 0)
+      Error(ERR_EXIT, "cannot open file '%s'", filename);
+
+    LoadLevelFromFilename(filename);
+    DumpLevel(&level);
+
+    exit(0);
   }
-  else if (strcmp(command, "help") == 0)
+  else if (strncmp(command, "dump tape ", 10) == 0)
   {
-    printf("The following commands are recognized:\n");
-    printf("   \"create graphicsinfo.conf\"\n");
-    printf("   \"create soundsinfo.conf\"\n");
-    printf("   \"create musicinfo.conf\"\n");
+    char *filename = &command[10];
+
+    if (access(filename, F_OK) != 0)
+      Error(ERR_EXIT, "cannot open file '%s'", filename);
+
+    LoadTapeFromFilename(filename);
+    DumpTape(&tape);
+
+    exit(0);
+  }
+  else if (strncmp(command, "autoplay ", 9) == 0)
+  {
+    char *str_copy = getStringCopy(&command[9]);
+    char *str_ptr = strchr(str_copy, ' ');
+
+    global.autoplay_leveldir = str_copy;
+    global.autoplay_level_nr = -1;
+
+    if (str_ptr != NULL)
+    {
+      *str_ptr++ = '\0';			/* terminate leveldir string */
+      global.autoplay_level_nr = atoi(str_ptr);	/* get level_nr value */
+    }
+  }
+  else
+  {
+    Error(ERR_EXIT_HELP, "unrecognized command '%s'", command);
   }
 }
 
 void CloseAllAndExit(int exit_value)
 {
-  int i;
-
   StopSounds();
   FreeAllSounds();
   FreeAllMusic();
   CloseAudio();		/* called after freeing sounds (needed for SDL) */
 
   FreeAllImages();
-
   FreeTileClipmasks();
-  for(i=0; i<NUM_BITMAPS; i++)
-    FreeBitmap(pix[i]);
+
+  if (bitmap_font_initial)
+    FreeBitmap(bitmap_font_initial);
 
   CloseVideoDisplay();
   ClosePlatformDependantStuff();