X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=8c391363250de573fbed086afb9b39ed25c448a5;hb=aff866268cfa75327030bedcbf64a507fdc3fac2;hp=26f0268c0481651f6f93b384e7bea57cf4513cfd;hpb=0cccb6d03df991d9c978ef3f7e16aadf3470a49b;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 26f0268c..8c391363 100644
--- a/src/init.c
+++ b/src/init.c
@@ -29,15 +29,17 @@
 static char *image_filename[NUM_PICTURES] =
 {
   "RocksScreen.pcx",
+  "RocksElements.pcx",
   "RocksDoor.pcx",
   "RocksHeroes.pcx",
   "RocksToons.pcx",
   "RocksSP.pcx",
   "RocksDC.pcx",
   "RocksMore.pcx",
-  "RocksFont.pcx",
-  "RocksFont2.pcx",
-  "RocksFont3.pcx"
+  "RocksFontBig.pcx",
+  "RocksFontSmall.pcx",
+  "RocksFontMedium.pcx",
+  "RocksFontEM.pcx"
 }; 
 
 static void InitSetup(void);
@@ -46,12 +48,16 @@ static void InitLevelInfo(void);
 static void InitArtworkInfo(void);
 static void InitLevelArtworkInfo(void);
 static void InitNetworkServer(void);
+static void InitImages(void);
 static void InitMixer(void);
 static void InitSound(void);
 static void InitGfx(void);
 static void InitGfxBackground(void);
 static void InitGadgets(void);
 static void InitElementProperties(void);
+static void InitElementInfo(void);
+static void InitGraphicInfo(void);
+static void InitSoundInfo();
 static void Execute_Debug_Command(char *);
 
 void OpenAll(void)
@@ -96,10 +102,12 @@ void OpenAll(void)
 
   InitGfx();
   InitElementProperties();	/* initializes IS_CHAR() for el2gfx() */
+  InitElementInfo();
 
   InitLevelInfo();
   InitLevelArtworkInfo();
   InitGadgets();		/* needs to know number of level series */
+  InitImages();			/* needs to know current level directory */
   InitSound();			/* needs to know current level directory */
 
   InitGfxBackground();
@@ -168,10 +176,21 @@ void InitNetworkServer()
 #endif
 }
 
+static void InitImages()
+{
+  InitImageList(image_config, image_config_suffix, NUM_IMAGE_FILES);
+
+  /* load custom images */
+  ReloadCustomImages();
+
+  InitGraphicInfo();
+}
+
 static void InitMixer()
 {
   OpenAudio();
-  InitSoundList(sound_effects, NUM_SOUND_EFFECTS);
+
+  InitSoundList(sound_config, sound_config_suffix, NUM_SOUND_FILES);
 
   StartMixer();
 }
@@ -182,8 +201,7 @@ static void InitSound()
   InitReloadSounds(artwork.snd_current->identifier);
   InitReloadMusic(artwork.mus_current->identifier);
 
-  /* initialize sound effect lookup table for element actions */
-  InitGameSound();
+  InitSoundInfo();
 }
 
 static void InitTileClipmasks()
@@ -263,8 +281,8 @@ static void InitTileClipmasks()
 
   clip_gc_values.graphics_exposures = False;
   clip_gc_valuemask = GCGraphicsExposures;
-  tile_clip_gc =
-    XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
+  tile_clip_gc = XCreateGC(display, window->drawable,
+			   clip_gc_valuemask, &clip_gc_values);
 
   for(i=0; i<NUM_BITMAPS; i++)
   {
@@ -283,9 +301,8 @@ static void InitTileClipmasks()
   /* create graphic context structures needed for clipping */
   clip_gc_values.graphics_exposures = False;
   clip_gc_valuemask = GCGraphicsExposures;
-  copy_clipmask_gc =
-    XCreateGC(display, pix[PIX_BACK]->clip_mask,
-	      clip_gc_valuemask, &clip_gc_values);
+  copy_clipmask_gc = XCreateGC(display, pix[PIX_BACK]->clip_mask,
+			       clip_gc_valuemask, &clip_gc_values);
 
   /* create only those clipping Pixmaps we really need */
   for(i=0; tile_needs_clipping[i].start>=0; i++)
@@ -297,11 +314,11 @@ static void InitTileClipmasks()
       int tile = tile_needs_clipping[i].start + j;
       int graphic = tile;
       int src_x, src_y;
-      int pixmap_nr;
+      Bitmap *src_bitmap;
       Pixmap src_pixmap;
 
-      getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
-      src_pixmap = pix[pixmap_nr]->clip_mask;
+      getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+      src_pixmap = src_bitmap->clip_mask;
 
       tile_clipmask[tile] = XCreatePixmap(display, window->drawable,
 					  TILEX, TILEY, 1);
@@ -366,9 +383,9 @@ void InitGfx()
   pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
   pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
 
-  pix[PIX_SMALLFONT] = LoadCustomImage(image_filename[PIX_SMALLFONT]);
+  pix[PIX_FONT_SMALL] = LoadCustomImage(image_filename[PIX_FONT_SMALL]);
 
-  InitFontInfo(NULL, NULL, pix[PIX_SMALLFONT]);
+  InitFontInfo(NULL, NULL, pix[PIX_FONT_SMALL], NULL);
 
   DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
   DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
@@ -377,7 +394,7 @@ void InitGfx()
 
   for(i=0; i<NUM_PICTURES; i++)
   {
-    if (i != PIX_SMALLFONT)
+    if (i != PIX_FONT_SMALL)
     {
       DrawInitText(image_filename[i], 150, FC_YELLOW);
 
@@ -385,7 +402,8 @@ void InitGfx()
     }
   }
 
-  InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]);
+  InitFontInfo(pix[PIX_FONT_BIG], pix[PIX_FONT_MEDIUM], pix[PIX_FONT_SMALL],
+	       pix[PIX_FONT_EM]);
 
   InitTileClipmasks();
 }
@@ -483,6 +501,9 @@ void ReloadCustomArtwork()
       ReloadCustomImage(pix[i], image_filename[i]);
     }
 
+    ReloadCustomImages();
+    InitGraphicInfo();
+
     FreeTileClipmasks();
     InitTileClipmasks();
     InitGfxBackground();
@@ -533,35 +554,522 @@ void InitGadgets()
   CreateScreenGadgets();
 }
 
+void InitElementInfo()
+{
+  int i, j;
+
+  static struct
+  {
+    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_SPIELER1,			GFX_SPIELER1		},
+    { EL_SPIELER2,			GFX_SPIELER2		},
+    { EL_SPIELER3,			GFX_SPIELER3		},
+    { EL_SPIELER4,			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_AMOEBA2DIAM,			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_BADEWANNE,			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_MAUER_LEBT,			GFX_MAUER_LEBT		},
+    { EL_MAUER_X,			GFX_MAUER_X		},
+    { EL_MAUER_Y,			GFX_MAUER_Y		},
+    { EL_MAUER_XY,			GFX_MAUER_XY		},
+    { EL_EDELSTEIN_BD,			GFX_EDELSTEIN_BD	},
+    { EL_EDELSTEIN_YELLOW,		GFX_EDELSTEIN_GELB	},
+    { EL_EDELSTEIN_RED,			GFX_EDELSTEIN_ROT	},
+    { EL_EDELSTEIN_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_PINGUIN,			GFX_PINGUIN		},
+    { EL_SCHWEIN,			GFX_SCHWEIN		},
+    { EL_DRACHE,			GFX_DRACHE		},
+    { EL_SONDE,				GFX_SONDE		},
+    { EL_PFEIL_LEFT,			GFX_PFEIL_LEFT		},
+    { EL_PFEIL_RIGHT,			GFX_PFEIL_RIGHT		},
+    { EL_PFEIL_UP,			GFX_PFEIL_UP		},
+    { EL_PFEIL_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_STEEL,		GFX_INVISIBLE_STEEL	},
+    { EL_BLACK_ORB,			GFX_BLACK_ORB		},
+    { EL_EM_GATE_1,			GFX_EM_GATE_1		},
+    { EL_EM_GATE_2,			GFX_EM_GATE_2		},
+    { EL_EM_GATE_3,			GFX_EM_GATE_3		},
+    { EL_EM_GATE_4,			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_KEY_1_FILE,			GFX_EM_KEY_1		},
+    { EL_EM_KEY_2_FILE,			GFX_EM_KEY_2		},
+    { EL_EM_KEY_3_FILE,			GFX_EM_KEY_3		},
+    { EL_EM_KEY_4_FILE,			GFX_EM_KEY_4		},
+    { EL_EM_KEY_1,			GFX_EM_KEY_1		},
+    { EL_EM_KEY_2,			GFX_EM_KEY_2		},
+    { EL_EM_KEY_3,			GFX_EM_KEY_3		},
+    { EL_EM_KEY_4,			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_PASSIVE,		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_1,		GFX_SWITCHGATE_SWITCH_1	},
+    { EL_SWITCHGATE_SWITCH_2,		GFX_SWITCHGATE_SWITCH_2	},
+    { EL_BELT1_LEFT,			GFX_BELT1_LEFT		},
+    { EL_BELT1_MIDDLE,			GFX_BELT1_MIDDLE	},
+    { EL_BELT1_RIGHT,			GFX_BELT1_RIGHT		},
+    { EL_BELT1_SWITCH_LEFT,		GFX_BELT1_SWITCH_LEFT	},
+    { EL_BELT1_SWITCH_MIDDLE,		GFX_BELT1_SWITCH_MIDDLE	},
+    { EL_BELT1_SWITCH_RIGHT,		GFX_BELT1_SWITCH_RIGHT	},
+    { EL_BELT2_LEFT,			GFX_BELT2_LEFT		},
+    { EL_BELT2_MIDDLE,			GFX_BELT2_MIDDLE	},
+    { EL_BELT2_RIGHT,			GFX_BELT2_RIGHT		},
+    { EL_BELT2_SWITCH_LEFT,		GFX_BELT2_SWITCH_LEFT	},
+    { EL_BELT2_SWITCH_MIDDLE,		GFX_BELT2_SWITCH_MIDDLE	},
+    { EL_BELT2_SWITCH_RIGHT,		GFX_BELT2_SWITCH_RIGHT	},
+    { EL_BELT3_LEFT,			GFX_BELT3_LEFT		},
+    { EL_BELT3_MIDDLE,			GFX_BELT3_MIDDLE	},
+    { EL_BELT3_RIGHT,			GFX_BELT3_RIGHT		},
+    { EL_BELT3_SWITCH_LEFT,		GFX_BELT3_SWITCH_LEFT	},
+    { EL_BELT3_SWITCH_MIDDLE,		GFX_BELT3_SWITCH_MIDDLE	},
+    { EL_BELT3_SWITCH_RIGHT,		GFX_BELT3_SWITCH_RIGHT	},
+    { EL_BELT4_LEFT,			GFX_BELT4_LEFT		},
+    { EL_BELT4_MIDDLE,			GFX_BELT4_MIDDLE	},
+    { EL_BELT4_RIGHT,			GFX_BELT4_RIGHT		},
+    { EL_BELT4_SWITCH_LEFT,		GFX_BELT4_SWITCH_LEFT	},
+    { EL_BELT4_SWITCH_MIDDLE,		GFX_BELT4_SWITCH_MIDDLE	},
+    { EL_BELT4_SWITCH_RIGHT,		GFX_BELT4_SWITCH_RIGHT	},
+    { EL_LANDMINE,			GFX_LANDMINE		},
+    { EL_ENVELOPE,			GFX_ENVELOPE		},
+    { EL_LIGHT_SWITCH_OFF,		GFX_LIGHT_SWITCH_OFF	},
+    { EL_LIGHT_SWITCH_ON,		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_STEEL_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_STEEL_WALL_1,		GFX_EMC_STEEL_WALL_1	},
+    { EL_EMC_STEEL_WALL_2,		GFX_EMC_STEEL_WALL_2	},
+    { EL_EMC_STEEL_WALL_3,		GFX_EMC_STEEL_WALL_3	},
+    { EL_EMC_STEEL_WALL_4,		GFX_EMC_STEEL_WALL_4	},
+    { EL_EMC_WALL_1,			GFX_EMC_WALL_1		},
+    { EL_EMC_WALL_2,			GFX_EMC_WALL_2		},
+    { EL_EMC_WALL_3,			GFX_EMC_WALL_3		},
+    { EL_EMC_WALL_4,			GFX_EMC_WALL_4		},
+    { EL_EMC_WALL_5,			GFX_EMC_WALL_5		},
+    { EL_EMC_WALL_6,			GFX_EMC_WALL_6		},
+    { EL_EMC_WALL_7,			GFX_EMC_WALL_7		},
+    { EL_EMC_WALL_8,			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_SPIELER1,
+      IMG_PLAYER1_LEFT,		IMG_PLAYER1_RIGHT,
+      IMG_PLAYER1_UP,		IMG_PLAYER1_DOWN
+    },
+    {
+      EL_SPIELER2,
+      IMG_PLAYER2_LEFT,		IMG_PLAYER2_RIGHT,
+      IMG_PLAYER2_UP,		IMG_PLAYER2_DOWN
+    },
+    {
+      EL_SPIELER3,
+      IMG_PLAYER3_LEFT,		IMG_PLAYER3_RIGHT,
+      IMG_PLAYER3_UP,		IMG_PLAYER3_DOWN
+    },
+    {
+      EL_SPIELER4,
+      IMG_PLAYER4_LEFT,		IMG_PLAYER4_RIGHT,
+      IMG_PLAYER4_UP,		IMG_PLAYER4_DOWN
+    },
+    {
+      EL_SCHWEIN,
+      IMG_PIG_LEFT,		IMG_PIG_RIGHT,
+      IMG_PIG_UP,		IMG_PIG_DOWN
+    },
+    {
+      EL_DRACHE,
+      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
+    },
+    {
+      EL_PINGUIN,
+      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
+    }
+  };
+
+  /* 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 (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
+    element_info[i].graphic[GFX_ACTION_DEFAULT] =
+      GFX_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);
+
+    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;
+
+    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)
+  {
+    int element = element_to_direction_graphic[i].element;
+
+    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;
+
+    element_info[element].has_direction_graphic[GFX_ACTION_DEFAULT] = TRUE;
+    i++;
+  }
+}
+
+static void InitGraphicInfo()
+{
+  int i;
+
+  image_files = getCurrentImageList();
+
+  for(i=0; i<MAX_GRAPHICS; i++)
+  {
+    /* always start with reliable default values */
+    graphic_info[i].bitmap = NULL;
+    graphic_info[i].src_x = 0;
+    graphic_info[i].src_y = 0;
+
+    getGraphicSource(i, &graphic_info[i].bitmap,
+		     &graphic_info[i].src_x, &graphic_info[i].src_y);
+  }
+
+  for(i=0; i<NUM_IMAGE_FILES; i++)
+  {
+    int *parameter = image_files[i].parameter;
+
+    /* 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;
+
+    new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
+
+    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;
+
+    /* 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;
+
+    /* 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;
+
+    /* animation synchronized with global frame counter, not move position */
+    new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
+
+    new_graphic_info[i].anim_vertical = parameter[GFX_ARG_VERTICAL];
+  }
+
+#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;
+#endif
+}
+
+static void InitSoundInfo()
+{
+  sound_files = getCurrentSoundList();
+
+  /* initialize sound effect lookup table for element actions */
+  InitGameSound();
+}
+
 void InitElementProperties()
 {
-  int i,j;
+  int i, j;
 
   static int ep_amoebalive[] =
   {
-    EL_AMOEBE_NASS,
-    EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL,
-    EL_AMOEBE_BD
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA
   };
   static int ep_amoebalive_num = SIZEOF_ARRAY_INT(ep_amoebalive);
 
   static int ep_amoeboid[] =
   {
-    EL_AMOEBE_TOT,
-    EL_AMOEBE_NASS,
-    EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL,
-    EL_AMOEBE_BD
+    EL_AMOEBA_DEAD,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA
   };
   static int ep_amoeboid_num = SIZEOF_ARRAY_INT(ep_amoeboid);
 
   static int ep_schluessel[] =
   {
-    EL_SCHLUESSEL1,
-    EL_SCHLUESSEL2,
-    EL_SCHLUESSEL3,
-    EL_SCHLUESSEL4,
+    EL_KEY1,
+    EL_KEY2,
+    EL_KEY3,
+    EL_KEY4,
     EL_EM_KEY_1,
     EL_EM_KEY_2,
     EL_EM_KEY_3,
@@ -571,14 +1079,14 @@ void InitElementProperties()
 
   static int ep_pforte[] =
   {
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
+    EL_GATE1,
+    EL_GATE2,
+    EL_GATE3,
+    EL_GATE4,
+    EL_GATE1_GRAY,
+    EL_GATE2_GRAY,
+    EL_GATE3_GRAY,
+    EL_GATE4_GRAY,
     EL_EM_GATE_1,
     EL_EM_GATE_2,
     EL_EM_GATE_3,
@@ -611,27 +1119,27 @@ void InitElementProperties()
 
   static int ep_solid[] =
   {
-    EL_BETON,
-    EL_MAUERWERK,
+    EL_STEELWALL,
+    EL_WALL,
     EL_MAUER_LEBT,
     EL_MAUER_X,
     EL_MAUER_Y,
     EL_MAUER_XY,
     EL_BD_WALL,
-    EL_FELSBODEN,
-    EL_AUSGANG_ZU,
+    EL_WALL_CRUMBLED,
+    EL_EXIT_CLOSED,
     EL_AUSGANG_ACT,
-    EL_AUSGANG_AUF,
-    EL_AMOEBE_TOT,
-    EL_AMOEBE_NASS,
-    EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL,
-    EL_AMOEBE_BD,
-    EL_MORAST_VOLL,
-    EL_MORAST_LEER,
+    EL_EXIT_OPEN,
+    EL_AMOEBA_DEAD,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    EL_QUICKSAND_FULL,
+    EL_QUICKSAND_EMPTY,
     EL_QUICKSAND_FILLING,
     EL_QUICKSAND_EMPTYING,
-    EL_MAGIC_WALL_OFF,
+    EL_MAGIC_WALL,
     EL_MAGIC_WALL_EMPTY,
     EL_MAGIC_WALL_EMPTYING,
     EL_MAGIC_WALL_FILLING,
@@ -643,13 +1151,13 @@ void InitElementProperties()
     EL_MAGIC_WALL_BD_FULL,
     EL_MAGIC_WALL_BD_FILLING,
     EL_MAGIC_WALL_BD_DEAD,
-    EL_LIFE,
-    EL_LIFE_ASYNC,
-    EL_BADEWANNE1,
-    EL_BADEWANNE2,
-    EL_BADEWANNE3,
-    EL_BADEWANNE4,
-    EL_BADEWANNE5,
+    EL_GAMEOFLIFE,
+    EL_BIOMAZE,
+    EL_ACIDPOOL_TOPLEFT,
+    EL_ACIDPOOL_TOPRIGHT,
+    EL_ACIDPOOL_BOTTOMLEFT,
+    EL_ACIDPOOL_BOTTOM,
+    EL_ACIDPOOL_BOTTOMRIGHT,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
@@ -716,14 +1224,14 @@ void InitElementProperties()
     EL_CRYSTAL,
     EL_WALL_PEARL,
     EL_WALL_CRYSTAL,
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
+    EL_GATE1,
+    EL_GATE2,
+    EL_GATE3,
+    EL_GATE4,
+    EL_GATE1_GRAY,
+    EL_GATE2_GRAY,
+    EL_GATE3_GRAY,
+    EL_GATE4_GRAY,
     EL_EM_GATE_1,
     EL_EM_GATE_2,
     EL_EM_GATE_3,
@@ -756,13 +1264,13 @@ void InitElementProperties()
 
   static int ep_massive[] =
   {
-    EL_BETON,
-    EL_SALZSAEURE,
-    EL_BADEWANNE1,
-    EL_BADEWANNE2,
-    EL_BADEWANNE3,
-    EL_BADEWANNE4,
-    EL_BADEWANNE5,
+    EL_STEELWALL,
+    EL_ACID,
+    EL_ACIDPOOL_TOPLEFT,
+    EL_ACIDPOOL_TOPRIGHT,
+    EL_ACIDPOOL_BOTTOMLEFT,
+    EL_ACIDPOOL_BOTTOM,
+    EL_ACIDPOOL_BOTTOMRIGHT,
     EL_SP_HARD_GRAY,
     EL_SP_HARD_GREEN,
     EL_SP_HARD_BLUE,
@@ -807,14 +1315,14 @@ void InitElementProperties()
     EL_EMC_STEEL_WALL_3,
     EL_EMC_STEEL_WALL_4,
     EL_CRYSTAL,
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
+    EL_GATE1,
+    EL_GATE2,
+    EL_GATE3,
+    EL_GATE4,
+    EL_GATE1_GRAY,
+    EL_GATE2_GRAY,
+    EL_GATE3_GRAY,
+    EL_GATE4_GRAY,
     EL_EM_GATE_1,
     EL_EM_GATE_2,
     EL_EM_GATE_3,
@@ -847,26 +1355,26 @@ void InitElementProperties()
 
   static int ep_slippery[] =
   {
-    EL_FELSBODEN,
+    EL_WALL_CRUMBLED,
     EL_BD_WALL,
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN,
+    EL_EMERALD,
     EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
-    EL_BOMBE,
-    EL_KOKOSNUSS,
-    EL_ABLENK_EIN,
-    EL_ABLENK_AUS,
-    EL_ZEIT_VOLL,
-    EL_ZEIT_LEER,
-    EL_BIRNE_EIN,
-    EL_BIRNE_AUS,
-    EL_BADEWANNE1,
-    EL_BADEWANNE2,
+    EL_EDELSTEIN_YELLOW,
+    EL_EDELSTEIN_RED,
+    EL_EDELSTEIN_PURPLE,
+    EL_DIAMOND,
+    EL_BOMB,
+    EL_NUT,
+    EL_ROBOT_WHEEL_ACTIVE,
+    EL_ROBOT_WHEEL,
+    EL_TIME_ORB_FULL,
+    EL_TIME_ORB_EMPTY,
+    EL_LAMP_ACTIVE,
+    EL_LAMP,
+    EL_ACIDPOOL_TOPLEFT,
+    EL_ACIDPOOL_TOPRIGHT,
     EL_SONDE,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
@@ -884,12 +1392,12 @@ void InitElementProperties()
 
   static int ep_enemy[] =
   {
-    EL_KAEFER,
-    EL_FLIEGER,
+    EL_BUG,
+    EL_SPACESHIP,
     EL_BUTTERFLY,
     EL_FIREFLY,
-    EL_MAMPFER,
-    EL_MAMPFER2,
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
     EL_ROBOT,
     EL_PACMAN,
     EL_SP_SNIKSNAK,
@@ -899,15 +1407,15 @@ void InitElementProperties()
 
   static int ep_mauer[] =
   {
-    EL_BETON,
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
+    EL_STEELWALL,
+    EL_GATE1,
+    EL_GATE2,
+    EL_GATE3,
+    EL_GATE4,
+    EL_GATE1_GRAY,
+    EL_GATE2_GRAY,
+    EL_GATE3_GRAY,
+    EL_GATE4_GRAY,
     EL_EM_GATE_1,
     EL_EM_GATE_2,
     EL_EM_GATE_3,
@@ -916,11 +1424,11 @@ void InitElementProperties()
     EL_EM_GATE_2X,
     EL_EM_GATE_3X,
     EL_EM_GATE_4X,
-    EL_AUSGANG_ZU,
+    EL_EXIT_CLOSED,
     EL_AUSGANG_ACT,
-    EL_AUSGANG_AUF,
-    EL_MAUERWERK,
-    EL_FELSBODEN,
+    EL_EXIT_OPEN,
+    EL_WALL,
+    EL_WALL_CRUMBLED,
     EL_MAUER_LEBT,
     EL_MAUER_X,
     EL_MAUER_Y,
@@ -965,22 +1473,22 @@ void InitElementProperties()
 
   static int ep_can_fall[] =
   {
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN,
+    EL_EMERALD,
     EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
-    EL_BOMBE,
-    EL_KOKOSNUSS,
-    EL_TROPFEN,
-    EL_MORAST_VOLL,
+    EL_EDELSTEIN_YELLOW,
+    EL_EDELSTEIN_RED,
+    EL_EDELSTEIN_PURPLE,
+    EL_DIAMOND,
+    EL_BOMB,
+    EL_NUT,
+    EL_AMOEBA_DROP,
+    EL_QUICKSAND_FULL,
     EL_MAGIC_WALL_FULL,
     EL_MAGIC_WALL_BD_FULL,
-    EL_ZEIT_VOLL,
-    EL_ZEIT_LEER,
+    EL_TIME_ORB_FULL,
+    EL_TIME_ORB_EMPTY,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
     EL_SP_DISK_ORANGE,
@@ -993,27 +1501,27 @@ void InitElementProperties()
 
   static int ep_can_smash[] =
   {
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN,
+    EL_EMERALD,
     EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
-    EL_SCHLUESSEL1,
-    EL_SCHLUESSEL2,
-    EL_SCHLUESSEL3,
-    EL_SCHLUESSEL4,
+    EL_EDELSTEIN_YELLOW,
+    EL_EDELSTEIN_RED,
+    EL_EDELSTEIN_PURPLE,
+    EL_DIAMOND,
+    EL_KEY1,
+    EL_KEY2,
+    EL_KEY3,
+    EL_KEY4,
     EL_EM_KEY_1,
     EL_EM_KEY_2,
     EL_EM_KEY_3,
     EL_EM_KEY_4,
-    EL_BOMBE,
-    EL_KOKOSNUSS,
-    EL_TROPFEN,
-    EL_ZEIT_VOLL,
-    EL_ZEIT_LEER,
+    EL_BOMB,
+    EL_NUT,
+    EL_AMOEBA_DROP,
+    EL_TIME_ORB_FULL,
+    EL_TIME_ORB_EMPTY,
     EL_SP_ZONK,
     EL_SP_INFOTRON,
     EL_SP_DISK_ORANGE,
@@ -1026,25 +1534,25 @@ void InitElementProperties()
 
   static int ep_can_change[] =
   {
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_EDELSTEIN,
+    EL_EMERALD,
     EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT
+    EL_EDELSTEIN_YELLOW,
+    EL_EDELSTEIN_RED,
+    EL_EDELSTEIN_PURPLE,
+    EL_DIAMOND
   };
   static int ep_can_change_num = SIZEOF_ARRAY_INT(ep_can_change);
 
   static int ep_can_move[] =
   {
-    EL_KAEFER,
-    EL_FLIEGER,
+    EL_BUG,
+    EL_SPACESHIP,
     EL_BUTTERFLY,
     EL_FIREFLY,
-    EL_MAMPFER,
-    EL_MAMPFER2,
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
     EL_ROBOT,
     EL_PACMAN,
     EL_MOLE,
@@ -1061,14 +1569,14 @@ void InitElementProperties()
 
   static int ep_could_move[] =
   {
-    EL_KAEFER_RIGHT,
-    EL_KAEFER_UP,
-    EL_KAEFER_LEFT,
-    EL_KAEFER_DOWN,
-    EL_FLIEGER_RIGHT,
-    EL_FLIEGER_UP,
-    EL_FLIEGER_LEFT,
-    EL_FLIEGER_DOWN,
+    EL_BUG_RIGHT,
+    EL_BUG_UP,
+    EL_BUG_LEFT,
+    EL_BUG_DOWN,
+    EL_SPACESHIP_RIGHT,
+    EL_SPACESHIP_UP,
+    EL_SPACESHIP_LEFT,
+    EL_SPACESHIP_DOWN,
     EL_BUTTERFLY_RIGHT,
     EL_BUTTERFLY_UP,
     EL_BUTTERFLY_LEFT,
@@ -1086,8 +1594,8 @@ void InitElementProperties()
 
   static int ep_dont_touch[] =
   {
-    EL_KAEFER,
-    EL_FLIEGER,
+    EL_BUG,
+    EL_SPACESHIP,
     EL_BUTTERFLY,
     EL_FIREFLY
   };
@@ -1095,16 +1603,16 @@ void InitElementProperties()
 
   static int ep_dont_go_to[] =
   {
-    EL_KAEFER,
-    EL_FLIEGER,
+    EL_BUG,
+    EL_SPACESHIP,
     EL_BUTTERFLY,
     EL_FIREFLY,
-    EL_MAMPFER,
-    EL_MAMPFER2,
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
     EL_ROBOT,
     EL_PACMAN,
-    EL_TROPFEN,
-    EL_SALZSAEURE,
+    EL_AMOEBA_DROP,
+    EL_ACID,
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
     EL_SP_BUG_ACTIVE,
@@ -1115,26 +1623,26 @@ void InitElementProperties()
 
   static int ep_mampf2[] =
   {
-    EL_ERDREICH,
-    EL_KAEFER,
-    EL_FLIEGER,
+    EL_SAND,
+    EL_BUG,
+    EL_SPACESHIP,
     EL_BUTTERFLY,
     EL_FIREFLY,
-    EL_MAMPFER,
+    EL_YAMYAM,
     EL_ROBOT,
     EL_PACMAN,
-    EL_TROPFEN,
-    EL_AMOEBE_TOT,
-    EL_AMOEBE_NASS,
-    EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL,
-    EL_AMOEBE_BD,
-    EL_EDELSTEIN,
+    EL_AMOEBA_DROP,
+    EL_AMOEBA_DEAD,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    EL_EMERALD,
     EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
+    EL_EDELSTEIN_YELLOW,
+    EL_EDELSTEIN_RED,
+    EL_EDELSTEIN_PURPLE,
+    EL_DIAMOND,
     EL_PEARL,
     EL_CRYSTAL
   };
@@ -1142,18 +1650,18 @@ void InitElementProperties()
 
   static int ep_bd_element[] =
   {
-    EL_LEERRAUM,
-    EL_ERDREICH,
-    EL_FELSBODEN,
+    EL_EMPTY,
+    EL_SAND,
+    EL_WALL_CRUMBLED,
     EL_BD_WALL,
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
     EL_EDELSTEIN_BD,
     EL_MAGIC_WALL_BD_OFF,
-    EL_AUSGANG_ZU,
-    EL_AUSGANG_AUF,
-    EL_BETON,
-    EL_SPIELFIGUR,
+    EL_EXIT_CLOSED,
+    EL_EXIT_OPEN,
+    EL_STEELWALL,
+    EL_PLAYER,
     EL_FIREFLY,
     EL_FIREFLY_1,
     EL_FIREFLY_2,
@@ -1164,63 +1672,63 @@ void InitElementProperties()
     EL_BUTTERFLY_2,
     EL_BUTTERFLY_3,
     EL_BUTTERFLY_4,
-    EL_AMOEBE_BD,
+    EL_BD_AMOEBA,
     EL_CHAR_FRAGE
   };
   static int ep_bd_element_num = SIZEOF_ARRAY_INT(ep_bd_element);
 
   static int ep_sb_element[] =
   {
-    EL_LEERRAUM,
-    EL_BETON,
+    EL_EMPTY,
+    EL_STEELWALL,
     EL_SOKOBAN_OBJEKT,
     EL_SOKOBAN_FELD_LEER,
     EL_SOKOBAN_FELD_VOLL,
-    EL_SPIELFIGUR,
+    EL_PLAYER,
     EL_INVISIBLE_STEEL
   };
   static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element);
 
   static int ep_gem[] =
   {
-    EL_EDELSTEIN,
+    EL_EMERALD,
     EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT
+    EL_EDELSTEIN_YELLOW,
+    EL_EDELSTEIN_RED,
+    EL_EDELSTEIN_PURPLE,
+    EL_DIAMOND
   };
   static int ep_gem_num = SIZEOF_ARRAY_INT(ep_gem);
 
   static int ep_inactive[] =
   {
-    EL_LEERRAUM,
-    EL_ERDREICH,
-    EL_MAUERWERK,
+    EL_EMPTY,
+    EL_SAND,
+    EL_WALL,
     EL_BD_WALL,
-    EL_FELSBODEN,
-    EL_SCHLUESSEL,
-    EL_BETON,
-    EL_AMOEBE_TOT,
-    EL_MORAST_LEER,
+    EL_WALL_CRUMBLED,
+    EL_KEY,
+    EL_STEELWALL,
+    EL_AMOEBA_DEAD,
+    EL_QUICKSAND_EMPTY,
     EL_BADEWANNE,
-    EL_ABLENK_AUS,
-    EL_SCHLUESSEL1,
-    EL_SCHLUESSEL2,
-    EL_SCHLUESSEL3,
-    EL_SCHLUESSEL4,
+    EL_ROBOT_WHEEL,
+    EL_KEY1,
+    EL_KEY2,
+    EL_KEY3,
+    EL_KEY4,
     EL_EM_KEY_1,
     EL_EM_KEY_2,
     EL_EM_KEY_3,
     EL_EM_KEY_4,
-    EL_PFORTE1,
-    EL_PFORTE2,
-    EL_PFORTE3,
-    EL_PFORTE4,
-    EL_PFORTE1X,
-    EL_PFORTE2X,
-    EL_PFORTE3X,
-    EL_PFORTE4X,
+    EL_GATE1,
+    EL_GATE2,
+    EL_GATE3,
+    EL_GATE4,
+    EL_GATE1_GRAY,
+    EL_GATE2_GRAY,
+    EL_GATE3_GRAY,
+    EL_GATE4_GRAY,
     EL_EM_GATE_1,
     EL_EM_GATE_2,
     EL_EM_GATE_3,
@@ -1229,28 +1737,28 @@ void InitElementProperties()
     EL_EM_GATE_2X,
     EL_EM_GATE_3X,
     EL_EM_GATE_4X,
-    EL_DYNAMITE_INACTIVE,
-    EL_UNSICHTBAR,
-    EL_BIRNE_AUS,
-    EL_BIRNE_EIN,
-    EL_ERZ_EDEL,
-    EL_ERZ_DIAM,
-    EL_ERZ_EDEL_BD,
-    EL_ERZ_EDEL_GELB,
+    EL_DYNAMITE,
+    EL_INVISIBLE_WALL,
+    EL_LAMP,
+    EL_LAMP_ACTIVE,
+    EL_WALL_EMERALD,
+    EL_WALL_DIAMOND,
+    EL_WALL_BD_DIAMOND,
+    EL_WALL_EMERALD_YELLOW,
     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_MAGIC_WALL_OFF,
+    EL_WALL_EMERALD_RED,
+    EL_WALL_EMERALD_PURPLE,
+    EL_ACIDPOOL_TOPLEFT,
+    EL_ACIDPOOL_TOPRIGHT,
+    EL_ACIDPOOL_BOTTOMLEFT,
+    EL_ACIDPOOL_BOTTOM,
+    EL_ACIDPOOL_BOTTOMRIGHT,
+    EL_MAGIC_WALL,
     EL_MAGIC_WALL_DEAD,
     EL_MAGIC_WALL_BD_OFF,
     EL_MAGIC_WALL_BD_DEAD,
@@ -1331,9 +1839,9 @@ void InitElementProperties()
 
   static int ep_explosive[] =
   {
-    EL_BOMBE,
+    EL_BOMB,
     EL_DYNAMITE_ACTIVE,
-    EL_DYNAMITE_INACTIVE,
+    EL_DYNAMITE,
     EL_DYNABOMB_ACTIVE_1,
     EL_DYNABOMB_ACTIVE_2,
     EL_DYNABOMB_ACTIVE_3,
@@ -1341,7 +1849,7 @@ void InitElementProperties()
     EL_DYNABOMB_NR,
     EL_DYNABOMB_SZ,
     EL_DYNABOMB_XL,
-    EL_KAEFER,
+    EL_BUG,
     EL_MOLE,
     EL_PINGUIN,
     EL_SCHWEIN,
@@ -1358,12 +1866,12 @@ void InitElementProperties()
 
   static int ep_mampf3[] =
   {
-    EL_EDELSTEIN,
+    EL_EMERALD,
     EL_EDELSTEIN_BD,
-    EL_EDELSTEIN_GELB,
-    EL_EDELSTEIN_ROT,
-    EL_EDELSTEIN_LILA,
-    EL_DIAMANT,
+    EL_EDELSTEIN_YELLOW,
+    EL_EDELSTEIN_RED,
+    EL_EDELSTEIN_PURPLE,
+    EL_DIAMOND,
     EL_PEARL,
     EL_CRYSTAL
   };
@@ -1371,11 +1879,11 @@ void InitElementProperties()
 
   static int ep_pushable[] =
   {
-    EL_FELSBROCKEN,
+    EL_ROCK,
     EL_BD_ROCK,
-    EL_BOMBE,
-    EL_KOKOSNUSS,
-    EL_ZEIT_LEER,
+    EL_BOMB,
+    EL_NUT,
+    EL_TIME_ORB_EMPTY,
     EL_SOKOBAN_FELD_VOLL,
     EL_SOKOBAN_OBJEKT,
     EL_SONDE,
@@ -1390,7 +1898,7 @@ void InitElementProperties()
 
   static int ep_player[] =
   {
-    EL_SPIELFIGUR,
+    EL_PLAYER,
     EL_SPIELER1,
     EL_SPIELER2,
     EL_SPIELER3,
@@ -1400,17 +1908,17 @@ void InitElementProperties()
 
   static int ep_has_content[] =
   {
-    EL_MAMPFER,
-    EL_AMOEBE_NASS,
-    EL_AMOEBE_NORM,
-    EL_AMOEBE_VOLL,
-    EL_AMOEBE_BD
+    EL_YAMYAM,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA
   };
   static int ep_has_content_num = SIZEOF_ARRAY_INT(ep_has_content);
 
   static int ep_eatable[] =
   {
-    EL_ERDREICH,
+    EL_SAND,
     EL_SP_BASE,
     EL_SP_BUG,
     EL_TRAP_INACTIVE,
@@ -1461,7 +1969,7 @@ void InitElementProperties()
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
     /* additional elements that appeared in newer Supaplex levels */
-    EL_UNSICHTBAR,
+    EL_INVISIBLE_WALL,
     /* more than one murphy in a level results in an inactive clone */
     EL_SP_MURPHY_CLONE
   };
@@ -1724,17 +2232,26 @@ void Execute_Debug_Command(char *command)
 {
   if (strcmp(command, "create graphicsinfo.conf") == 0)
   {
-    printf("# (Currently only \"name\" and \"sort_priority\" recognized.)\n");
+    int i;
+
+    printf("# You can configure additional/alternative image files here.\n");
+    printf("# (The images below are default and therefore commented out.)\n");
     printf("\n");
     printf("%s\n", getFormattedSetupEntry("name", "Classic Graphics"));
     printf("\n");
     printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+    printf("\n");
+
+    for (i=0; image_config[i].token != NULL; i++)
+      printf("# %s\n",
+	     getFormattedSetupEntry(image_config[i].token,
+				    image_config[i].value));
   }
   else if (strcmp(command, "create soundsinfo.conf") == 0)
   {
     int i;
 
-    printf("# You can configure additional/alternative sound effects here\n");
+    printf("# You can configure additional/alternative sound files here.\n");
     printf("# (The sounds below are default and therefore commented out.)\n");
     printf("\n");
     printf("%s\n", getFormattedSetupEntry("name", "Classic Sounds"));
@@ -1742,10 +2259,10 @@ void Execute_Debug_Command(char *command)
     printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
     printf("\n");
 
-    for (i=0; i<NUM_SOUND_EFFECTS; i++)
+    for (i=0; sound_config[i].token != NULL; i++)
       printf("# %s\n",
-	     getFormattedSetupEntry(sound_effects[i].text,
-				    sound_effects[i].default_filename));
+	     getFormattedSetupEntry(sound_config[i].token,
+				    sound_config[i].value));
   }
   else if (strcmp(command, "create musicinfo.conf") == 0)
   {
@@ -1755,6 +2272,13 @@ void Execute_Debug_Command(char *command)
     printf("\n");
     printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
   }
+  else if (strcmp(command, "help") == 0)
+  {
+    printf("The following commands are recognized:\n");
+    printf("   \"create graphicsinfo.conf\"\n");
+    printf("   \"create soundsinfo.conf\"\n");
+    printf("   \"create musicinfo.conf\"\n");
+  }
 }
 
 void CloseAllAndExit(int exit_value)
@@ -1766,6 +2290,8 @@ void CloseAllAndExit(int exit_value)
   FreeAllMusic();
   CloseAudio();		/* called after freeing sounds (needed for SDL) */
 
+  FreeAllImages();
+
   FreeTileClipmasks();
   for(i=0; i<NUM_BITMAPS; i++)
     FreeBitmap(pix[i]);