X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Finit.c;h=e57e4aafa5a7cd068ebfdc5b52095aa918caa0b8;hp=5d862c6f3689a860c6e6f51ecd23335a123eba30;hb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;hpb=93926b59ca45db5bb31f63e08d7ee729745e0306

diff --git a/src/init.c b/src/init.c
index 5d862c6f..e57e4aaf 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* init.c                                                   *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// init.c
+// ============================================================================
 
 #include "libgame/libgame.h"
 
@@ -38,9 +36,6 @@
 #define CONFIG_TOKEN_FONT_INITIAL		"font.initial"
 #define CONFIG_TOKEN_GLOBAL_BUSY		"global.busy"
 
-#define DEBUG_PRINT_INIT_TIMESTAMPS		TRUE
-#define DEBUG_PRINT_INIT_TIMESTAMPS_DEPTH	1
-
 
 static struct FontBitmapInfo font_initial[NUM_INITIAL_FONTS];
 static struct GraphicInfo    anim_initial;
@@ -89,78 +84,12 @@ static int copy_properties[][5] =
 };
 
 
-static void print_timestamp_ext(char *message, char *mode)
-{
-#if DEBUG
-#if DEBUG_PRINT_INIT_TIMESTAMPS
-  static char *debug_message = NULL;
-  static char *last_message = NULL;
-  static int counter_nr = 0;
-  int max_depth = DEBUG_PRINT_INIT_TIMESTAMPS_DEPTH;
-
-  checked_free(debug_message);
-  debug_message = getStringCat3(mode, " ", message);
-
-  if (strEqual(mode, "INIT"))
-  {
-    debug_print_timestamp(counter_nr, NULL);
-
-    if (counter_nr + 1 < max_depth)
-      debug_print_timestamp(counter_nr, debug_message);
-
-    counter_nr++;
-
-    debug_print_timestamp(counter_nr, NULL);
-  }
-  else if (strEqual(mode, "DONE"))
-  {
-    counter_nr--;
-
-    if (counter_nr + 1 < max_depth ||
-	(counter_nr == 0 && max_depth == 1))
-    {
-      last_message = message;
-
-      if (counter_nr == 0 && max_depth == 1)
-      {
-	checked_free(debug_message);
-	debug_message = getStringCat3("TIME", " ", message);
-      }
-
-      debug_print_timestamp(counter_nr, debug_message);
-    }
-  }
-  else if (!strEqual(mode, "TIME") ||
-	   !strEqual(message, last_message))
-  {
-    if (counter_nr < max_depth)
-      debug_print_timestamp(counter_nr, debug_message);
-  }
-#endif
-#endif
-}
-
-static void print_timestamp_init(char *message)
-{
-  print_timestamp_ext(message, "INIT");
-}
-
-static void print_timestamp_time(char *message)
-{
-  print_timestamp_ext(message, "TIME");
-}
-
-static void print_timestamp_done(char *message)
-{
-  print_timestamp_ext(message, "DONE");
-}
-
 void DrawInitAnim()
 {
   struct GraphicInfo *graphic_info_last = graphic_info;
   int graphic = 0;
-  static unsigned long action_delay = 0;
-  unsigned long action_delay_value = GameFrameDelay;
+  static unsigned int action_delay = 0;
+  unsigned int action_delay_value = GameFrameDelay;
   int sync_frame = FrameCounter;
   int x, y;
 
@@ -173,68 +102,21 @@ void DrawInitAnim()
   if (!DelayReached(&action_delay, action_delay_value))
     return;
 
-#if 0
-  {
-    static unsigned long last_counter = -1;
-    unsigned long current_counter = Counter();
-    unsigned long delay = current_counter - last_counter;
-
-    if (last_counter != -1 && delay > action_delay_value + 5)
-      printf("::: DrawInitAnim: DELAY TOO LONG: %ld\n", delay);
-
-    last_counter = current_counter;
-  }
-#endif
-
-#if 0
-  anim_initial.anim_mode = ANIM_LOOP;
-  anim_initial.anim_start_frame = 0;
-  anim_initial.offset_x = anim_initial.width;
-  anim_initial.offset_y = 0;
-#endif
-
-#if 1
-  x = ALIGNED_TEXT_XPOS(&init.busy);
-  y = ALIGNED_TEXT_YPOS(&init.busy);
-#else
-  x = WIN_XSIZE / 2 - TILESIZE / 2;
-  y = WIN_YSIZE / 2 - TILESIZE / 2;
-#endif
+  x = ALIGNED_TEXT_XPOS(&init_last.busy);
+  y = ALIGNED_TEXT_YPOS(&init_last.busy);
 
   graphic_info = &anim_initial;		/* graphic == 0 => anim_initial */
 
-#if 0
-  {
-    static boolean done = FALSE;
-
-    // if (!done)
-      printf("::: %d, %d, %d, %d => %d, %d [%d, %d] [%d, %d]\n",
-	     init.busy.x, init.busy.y,
-	     init.busy.align, init.busy.valign,
-	     x, y,
-	     graphic_info[graphic].width,
-	     graphic_info[graphic].height,
-	     sync_frame, anim_initial.anim_delay);
-
-    done = TRUE;
-  }
-#endif
-
   if (sync_frame % anim_initial.anim_delay == 0)
   {
-#if 1
     Bitmap *src_bitmap;
     int src_x, src_y;
     int width = graphic_info[graphic].width;
     int height = graphic_info[graphic].height;
     int frame = getGraphicAnimationFrame(graphic, sync_frame);
 
-    getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
+    getFixedGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
     BlitBitmap(src_bitmap, window, src_x, src_y, width, height, x, y);
-#else
-    /* !!! this can only draw TILEX/TILEY size animations !!! */
-    DrawGraphicAnimationExt(window, x, y, graphic, sync_frame, NO_MASKING);
-#endif
   }
 
   graphic_info = graphic_info_last;
@@ -271,17 +153,14 @@ void InitGadgets()
 
 inline void InitElementSmallImagesScaledUp(int graphic)
 {
-#if 0
-  struct FileInfo *fi = getImageListEntryFromImageID(graphic);
-
-  printf("::: '%s' -> '%s'\n", fi->token, fi->filename);
-#endif
-
-  CreateImageWithSmallImages(graphic, graphic_info[graphic].scale_up_factor);
+  CreateImageWithSmallImages(graphic, graphic_info[graphic].scale_up_factor,
+			     graphic_info[graphic].tile_size);
 }
 
 void InitElementSmallImages()
 {
+  print_timestamp_init("InitElementSmallImages");
+
   static int special_graphics[] =
   {
     IMG_EDITOR_ELEMENT_BORDER,
@@ -294,21 +173,30 @@ void InitElementSmallImages()
   int num_property_mappings = getImageListPropertyMappingSize();
   int i;
 
+  print_timestamp_time("getImageListPropertyMapping/Size");
+
+  print_timestamp_init("InitElementSmallImagesScaledUp (1)");
   /* initialize normal images from static configuration */
   for (i = 0; element_to_graphic[i].element > -1; i++)
     InitElementSmallImagesScaledUp(element_to_graphic[i].graphic);
+  print_timestamp_done("InitElementSmallImagesScaledUp (1)");
 
   /* initialize special images from static configuration */
   for (i = 0; element_to_special_graphic[i].element > -1; i++)
     InitElementSmallImagesScaledUp(element_to_special_graphic[i].graphic);
+  print_timestamp_time("InitElementSmallImagesScaledUp (2)");
 
   /* initialize images from dynamic configuration (may be elements or other) */
   for (i = 0; i < num_property_mappings; i++)
     InitElementSmallImagesScaledUp(property_mapping[i].artwork_index);
+  print_timestamp_time("InitElementSmallImagesScaledUp (3)");
 
   /* initialize special images from above list (non-element images) */
   for (i = 0; special_graphics[i] > -1; i++)
     InitElementSmallImagesScaledUp(special_graphics[i]);
+  print_timestamp_time("InitElementSmallImagesScaledUp (4)");
+
+  print_timestamp_done("InitElementSmallImages");
 }
 
 void InitScaledImages()
@@ -329,6 +217,14 @@ void SetBitmaps_EM(Bitmap **em_bitmap)
 }
 #endif
 
+#if 0
+/* !!! FIX THIS (CHANGE TO USING NORMAL ELEMENT GRAPHIC DEFINITIONS) !!! */
+void SetBitmaps_SP(Bitmap **sp_bitmap)
+{
+  *sp_bitmap = graphic_info[IMG_SP_OBJECTS].bitmap;
+}
+#endif
+
 static int getFontBitmapID(int font_nr)
 {
   int special = -1;
@@ -339,10 +235,6 @@ static int getFontBitmapID(int font_nr)
     special = game_status;
   else if (game_status == GAME_MODE_PSEUDO_TYPENAME)
     special = GFX_SPECIAL_ARG_MAIN;
-#if 0
-  else if (game_status == GAME_MODE_PLAYING)
-    special = GFX_SPECIAL_ARG_DOOR;
-#endif
 
   if (special != -1)
     return font_info[font_nr].special_bitmap_id[special];
@@ -352,19 +244,10 @@ static int getFontBitmapID(int font_nr)
 
 static int getFontFromToken(char *token)
 {
-#if 1
   char *value = getHashEntry(font_token_hash, token);
 
   if (value != NULL)
     return atoi(value);
-#else
-  int i;
-
-  /* !!! OPTIMIZE THIS BY USING HASH !!! */
-  for (i = 0; i < NUM_FONTS; i++)
-    if (strEqual(token, font_info[i].token_name))
-      return i;
-#endif
 
   /* if font not found, use reliable default value */
   return FONT_INITIAL_1;
@@ -689,16 +572,6 @@ void InitElementGraphicInfo()
     int graphic   = property_mapping[i].artwork_index;
     boolean crumbled = FALSE;
 
-#if 0
-    if ((element == EL_EM_DYNAMITE ||
-	 element == EL_EM_DYNAMITE_ACTIVE) &&
-	action == ACTION_ACTIVE &&
-	(special == GFX_SPECIAL_ARG_EDITOR ||
-	 special == GFX_SPECIAL_ARG_PANEL))
-      printf("::: DYNAMIC: %d, %d, %d -> %d\n",
-	     element, action, special, graphic);
-#endif
-
     if (special == GFX_SPECIAL_ARG_CRUMBLED)
     {
       special = -1;
@@ -771,12 +644,9 @@ void InitElementGraphicInfo()
     }
   }
 
-#if 1
   /* set hardcoded definitions for some runtime elements without graphic */
   element_info[EL_AMOEBA_TO_DIAMOND].graphic[ACTION_DEFAULT] = IMG_AMOEBA_DEAD;
-#endif
 
-#if 1
   /* set hardcoded definitions for some internal elements without graphic */
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
@@ -785,7 +655,6 @@ void InitElementGraphicInfo()
     else if (IS_EDITOR_CASCADE_ACTIVE(i))
       element_info[i].graphic[ACTION_DEFAULT] = IMG_EDITOR_CASCADE_LIST_ACTIVE;
   }
-#endif
 
   /* now set all undefined/invalid graphics to -1 to set to default after it */
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
@@ -857,8 +726,8 @@ void InitElementGraphicInfo()
 	  if (swap_movement_tiles_always || swap_movement_tiles_autodetected)
 	  {
 	    /* get current (wrong) backside tile coordinates */
-	    getGraphicSourceExt(graphic, 0, &dummy, &src_x_back, &src_y_back,
-				TRUE);
+	    getFixedGraphicSourceExt(graphic, 0, &dummy,
+				     &src_x_back, &src_y_back, TRUE);
 
 	    /* set frontside tile coordinates to backside tile coordinates */
 	    g->src_x = src_x_back;
@@ -888,14 +757,9 @@ void InitElementGraphicInfo()
 
     if (default_graphic == -1)
       default_graphic = IMG_UNKNOWN;
-#if 1
+
     if (default_crumbled == -1)
       default_crumbled = default_graphic;
-#else
-    /* !!! THIS LOOKS CRAPPY FOR SAND ETC. WITHOUT CRUMBLED GRAPHICS !!! */
-    if (default_crumbled == -1)
-      default_crumbled = IMG_EMPTY;
-#endif
 
     for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
     {
@@ -906,14 +770,9 @@ void InitElementGraphicInfo()
 
       if (default_direction_graphic[dir] == -1)
 	default_direction_graphic[dir] = default_graphic;
-#if 1
+
       if (default_direction_crumbled[dir] == -1)
 	default_direction_crumbled[dir] = default_direction_graphic[dir];
-#else
-      /* !!! THIS LOOKS CRAPPY FOR SAND ETC. WITHOUT CRUMBLED GRAPHICS !!! */
-      if (default_direction_crumbled[dir] == -1)
-	default_direction_crumbled[dir] = default_crumbled;
-#endif
     }
 
     for (act = 0; act < NUM_ACTIONS; act++)
@@ -949,7 +808,6 @@ void InitElementGraphicInfo()
       if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].crumbled[act] != -1)
 	default_action_crumbled = element_info[EL_SB_DEFAULT].crumbled[act];
 
-#if 1
       /* !!! needed because EL_EMPTY_SPACE treated as IS_SP_ELEMENT !!! */
       /* !!! make this better !!! */
       if (i == EL_EMPTY_SPACE)
@@ -957,18 +815,12 @@ void InitElementGraphicInfo()
 	default_action_graphic = element_info[EL_DEFAULT].graphic[act];
 	default_action_crumbled = element_info[EL_DEFAULT].crumbled[act];
       }
-#endif
 
       if (default_action_graphic == -1)
 	default_action_graphic = default_graphic;
-#if 1
+
       if (default_action_crumbled == -1)
 	default_action_crumbled = default_action_graphic;
-#else
-      /* !!! THIS LOOKS CRAPPY FOR SAND ETC. WITHOUT CRUMBLED GRAPHICS !!! */
-      if (default_action_crumbled == -1)
-	default_action_crumbled = default_crumbled;
-#endif
 
       for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
       {
@@ -990,20 +842,9 @@ void InitElementGraphicInfo()
 	  element_info[i].direction_graphic[act][dir] =
 	    default_action_direction_graphic;
 
-#if 1
 	if (default_action_direction_crumbled == -1)
 	  default_action_direction_crumbled =
 	    element_info[i].direction_graphic[act][dir];
-#else
-	if (default_action_direction_crumbled == -1)
-	  default_action_direction_crumbled =
-	    (act_remove ? default_remove_graphic :
-	     act_turning ?
-	     element_info[i].direction_crumbled[ACTION_TURNING][dir] :
-	     default_action_crumbled != default_crumbled ?
-	     default_action_crumbled :
-	     default_direction_crumbled[dir]);
-#endif
 
 	if (element_info[i].direction_crumbled[act][dir] == -1)
 	  element_info[i].direction_crumbled[act][dir] =
@@ -1016,62 +857,13 @@ void InitElementGraphicInfo()
 	  (act_remove ? default_remove_graphic :
 	   act_turning ? element_info[i].graphic[ACTION_TURNING] :
 	   default_action_graphic);
-#if 1
+
       if (element_info[i].crumbled[act] == -1)
 	element_info[i].crumbled[act] = element_info[i].graphic[act];
-#else
-      if (element_info[i].crumbled[act] == -1)
-	element_info[i].crumbled[act] =
-	  (act_remove ? default_remove_graphic :
-	   act_turning ? element_info[i].crumbled[ACTION_TURNING] :
-	   default_action_crumbled);
-#endif
     }
   }
 
   UPDATE_BUSY_STATE();
-
-#if 0
-  /* !!! THIS ALSO CLEARS SPECIAL FLAGS (AND IS NOT NEEDED ANYWAY) !!! */
-  /* set animation mode to "none" for each graphic with only 1 frame */
-  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
-  {
-    for (act = 0; act < NUM_ACTIONS; act++)
-    {
-      int graphic = element_info[i].graphic[act];
-      int crumbled = element_info[i].crumbled[act];
-
-      if (graphic_info[graphic].anim_frames == 1)
-	graphic_info[graphic].anim_mode = ANIM_NONE;
-      if (graphic_info[crumbled].anim_frames == 1)
-	graphic_info[crumbled].anim_mode = ANIM_NONE;
-
-      for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
-      {
-	graphic = element_info[i].direction_graphic[act][dir];
-	crumbled = element_info[i].direction_crumbled[act][dir];
-
-	if (graphic_info[graphic].anim_frames == 1)
-	  graphic_info[graphic].anim_mode = ANIM_NONE;
-	if (graphic_info[crumbled].anim_frames == 1)
-	  graphic_info[crumbled].anim_mode = ANIM_NONE;
-      }
-    }
-  }
-#endif
-
-#if 0
-#if DEBUG
-  if (options.verbose)
-  {
-    for (i = 0; i < MAX_NUM_ELEMENTS; i++)
-      if (element_info[i].graphic[ACTION_DEFAULT] == IMG_UNKNOWN &&
-	  i != EL_UNKNOWN)
-	Error(ERR_INFO, "warning: no graphic for element '%s' (%d)",
-	      element_info[i].token_name, i);
-  }
-#endif
-#endif
 }
 
 void InitElementSpecialGraphicInfo()
@@ -1098,15 +890,6 @@ void InitElementSpecialGraphicInfo()
     boolean special_redefined =
       getImageListEntryFromImageID(graphic)->redefined;
 
-#if 0
-    if ((element == EL_EM_DYNAMITE ||
-	 element == EL_EM_DYNAMITE_ACTIVE) &&
-	(special == GFX_SPECIAL_ARG_EDITOR ||
-	 special == GFX_SPECIAL_ARG_PANEL))
-      printf("::: SPECIAL STATIC: %d, %d -> %d\n",
-	     element, special, graphic);
-#endif
-
     /* if the base graphic ("emerald", for example) has been redefined,
        but not the special graphic ("emerald.EDITOR", for example), do not
        use an existing (in this case considered obsolete) special graphic
@@ -1126,43 +909,12 @@ void InitElementSpecialGraphicInfo()
     int special   = property_mapping[i].ext3_index;
     int graphic   = property_mapping[i].artwork_index;
 
-#if 0
-    if ((element == EL_EM_DYNAMITE ||
-	 element == EL_EM_DYNAMITE_ACTIVE ||
-	 element == EL_CONVEYOR_BELT_1_MIDDLE ||
-	 element == EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE) &&
-	(special == GFX_SPECIAL_ARG_EDITOR ||
-	 special == GFX_SPECIAL_ARG_PANEL))
-      printf("::: SPECIAL DYNAMIC: %d, %d -> %d [%d]\n",
-	     element, special, graphic, property_mapping[i].ext1_index);
-#endif
-
-#if 0
-    if (element == EL_CONVEYOR_BELT_1_MIDDLE &&
-	action == ACTION_ACTIVE)
-    {
-      element = EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE;
-      action = -1;
-    }
-#endif
-
-#if 0
-    if (element == EL_MAGIC_WALL &&
-	action == ACTION_ACTIVE)
-    {
-      element = EL_MAGIC_WALL_ACTIVE;
-      action = -1;
-    }
-#endif
-
-#if 1
     /* for action ".active", replace element with active element, if exists */
     if (action == ACTION_ACTIVE && element != ELEMENT_ACTIVE(element))
     {
       element = ELEMENT_ACTIVE(element);
       action = -1;
     }
-#endif
 
     if (element >= MAX_NUM_ELEMENTS)
       continue;
@@ -1191,7 +943,6 @@ static int get_graphic_parameter_value(char *value_raw, char *suffix, int type)
   if (strEqual(value_raw, ARG_UNDEFINED))
     return ARG_UNDEFINED_VALUE;
 
-#if 1
   if (type == TYPE_ELEMENT)
   {
     char *value = getHashEntry(element_token_hash, value_raw);
@@ -1205,36 +956,6 @@ static int get_graphic_parameter_value(char *value_raw, char *suffix, int type)
     return (value != NULL ? atoi(value) : IMG_UNDEFINED);
   }
 
-#else
-
-  int i;
-  int x = 0;
-
-  /* !!! THIS IS BUGGY !!! NOT SURE IF YOU GET ELEMENT ID OR GRAPHIC ID !!! */
-  /* !!! (possible reason why ".clone_from" with elements doesn't work) !!! */
-
-  /* !!! OPTIMIZE THIS BY USING HASH !!! */
-  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
-    if (strEqual(element_info[i].token_name, value_raw))
-      return i;
-
-  /* !!! OPTIMIZE THIS BY USING HASH !!! */
-  for (i = 0; image_config[i].token != NULL; i++)
-  {
-    int len_config_value = strlen(image_config[i].value);
-
-    if (!strEqual(&image_config[i].value[len_config_value - 4], ".pcx") &&
-	!strEqual(&image_config[i].value[len_config_value - 4], ".wav") &&
-	!strEqual(image_config[i].value, UNDEFINED_FILENAME))
-      continue;
-
-    if (strEqual(image_config[i].token, value_raw))
-      return x;
-
-    x++;
-  }
-#endif
-
   return -1;
 }
 
@@ -1277,6 +998,7 @@ static void set_graphic_parameters_ext(int graphic, int *parameter,
   g->diggable_like = -1;		/* do not use clone element */
   g->border_size = TILEX / 8;		/* "CRUMBLED" border size */
   g->scale_up_factor = 1;		/* default: no scaling up */
+  g->tile_size = TILESIZE;		/* default: standard tile size */
   g->clone_from = -1;			/* do not use clone graphic */
   g->anim_delay_fixed = 0;
   g->anim_delay_random = 0;
@@ -1289,25 +1011,29 @@ static void set_graphic_parameters_ext(int graphic, int *parameter,
   g->align = ALIGN_CENTER;		/* default for title screens */
   g->valign = VALIGN_MIDDLE;		/* default for title screens */
   g->sort_priority = 0;			/* default for title screens */
+  g->class = 0;
+  g->style = STYLE_DEFAULT;
 
   g->bitmap = src_bitmap;
 
-#if 1
   /* optional zoom factor for scaling up the image to a larger size */
   if (parameter[GFX_ARG_SCALE_UP_FACTOR] != ARG_UNDEFINED_VALUE)
     g->scale_up_factor = parameter[GFX_ARG_SCALE_UP_FACTOR];
   if (g->scale_up_factor < 1)
     g->scale_up_factor = 1;		/* no scaling */
-#endif
 
-#if 1
+  /* optional tile size for using non-standard image size */
+  if (parameter[GFX_ARG_TILE_SIZE] != ARG_UNDEFINED_VALUE)
+    g->tile_size = parameter[GFX_ARG_TILE_SIZE];
+  if (g->tile_size < TILESIZE)
+    g->tile_size = TILESIZE;		/* standard tile size */
+
   if (g->use_image_size)
   {
     /* set new default bitmap size (with scaling, but without small images) */
     g->width  = get_scaled_graphic_width(graphic);
     g->height = get_scaled_graphic_height(graphic);
   }
-#endif
 
   /* optional x and y tile position of animation frame sequence */
   if (parameter[GFX_ARG_XPOS] != ARG_UNDEFINED_VALUE)
@@ -1327,13 +1053,28 @@ static void set_graphic_parameters_ext(int graphic, int *parameter,
   if (parameter[GFX_ARG_HEIGHT] != ARG_UNDEFINED_VALUE)
     g->height = parameter[GFX_ARG_HEIGHT];
 
-#if 0
-  /* optional zoom factor for scaling up the image to a larger size */
-  if (parameter[GFX_ARG_SCALE_UP_FACTOR] != ARG_UNDEFINED_VALUE)
-    g->scale_up_factor = parameter[GFX_ARG_SCALE_UP_FACTOR];
-  if (g->scale_up_factor < 1)
-    g->scale_up_factor = 1;		/* no scaling */
-#endif
+  if (src_bitmap)
+  {
+    if (g->width <= 0)
+    {
+      Error(ERR_INFO_LINE, "-");
+      Error(ERR_WARN, "invalid value %d for '%s.width' (fallback done to %d)",
+	    g->width, getTokenFromImageID(graphic), TILEX);
+      Error(ERR_INFO_LINE, "-");
+
+      g->width = TILEX;		/* will be checked to be inside bitmap later */
+    }
+
+    if (g->height <= 0)
+    {
+      Error(ERR_INFO_LINE, "-");
+      Error(ERR_WARN, "invalid value %d for '%s.height' (fallback done to %d)",
+	    g->height, getTokenFromImageID(graphic), TILEY);
+      Error(ERR_INFO_LINE, "-");
+
+      g->height = TILEY;	/* will be checked to be inside bitmap later */
+    }
+  }
 
   if (src_bitmap)
   {
@@ -1421,10 +1162,6 @@ static void set_graphic_parameters_ext(int graphic, int *parameter,
     g->anim_delay = 1;
 
   g->anim_mode = parameter[GFX_ARG_ANIM_MODE];
-#if 0
-  if (g->anim_frames == 1)
-    g->anim_mode = ANIM_NONE;
-#endif
 
   /* automatically determine correct start frame, if not defined */
   if (parameter[GFX_ARG_START_FRAME] == ARG_UNDEFINED_VALUE)
@@ -1489,11 +1226,21 @@ static void set_graphic_parameters_ext(int graphic, int *parameter,
     g->valign = parameter[GFX_ARG_VALIGN];
   if (parameter[GFX_ARG_SORT_PRIORITY] != ARG_UNDEFINED_VALUE)
     g->sort_priority = parameter[GFX_ARG_SORT_PRIORITY];
+
+  if (parameter[GFX_ARG_CLASS] != ARG_UNDEFINED_VALUE)
+    g->class = parameter[GFX_ARG_CLASS];
+  if (parameter[GFX_ARG_STYLE] != ARG_UNDEFINED_VALUE)
+    g->style = parameter[GFX_ARG_STYLE];
+
+  /* this is only used for drawing menu buttons and text */
+  g->active_xoffset = parameter[GFX_ARG_ACTIVE_XOFFSET];
+  g->active_yoffset = parameter[GFX_ARG_ACTIVE_YOFFSET];
+  g->pressed_xoffset = parameter[GFX_ARG_PRESSED_XOFFSET];
+  g->pressed_yoffset = parameter[GFX_ARG_PRESSED_YOFFSET];
 }
 
 static void set_graphic_parameters(int graphic)
 {
-#if 1
   struct FileInfo *image = getImageListEntryFromImageID(graphic);
   char **parameter_raw = image->parameter;
   Bitmap *src_bitmap = getBitmapFromImageID(graphic);
@@ -1512,258 +1259,6 @@ static void set_graphic_parameters(int graphic)
 
   set_graphic_parameters_ext(graphic, parameter, src_bitmap);
 
-#else
-
-  struct FileInfo *image = getImageListEntryFromImageID(graphic);
-  char **parameter_raw = image->parameter;
-  Bitmap *src_bitmap = getBitmapFromImageID(graphic);
-  int parameter[NUM_GFX_ARGS];
-  int anim_frames_per_row = 1, anim_frames_per_col = 1;
-  int anim_frames_per_line = 1;
-  int i;
-
-  /* if fallback to default artwork is done, also use the default parameters */
-  if (image->fallback_to_default)
-    parameter_raw = image->default_parameter;
-
-  /* get integer values from string parameters */
-  for (i = 0; i < NUM_GFX_ARGS; i++)
-    parameter[i] = get_graphic_parameter_value(parameter_raw[i],
-					       image_config_suffix[i].token,
-					       image_config_suffix[i].type);
-
-  graphic_info[graphic].bitmap = src_bitmap;
-
-  /* always start with reliable default values */
-  graphic_info[graphic].src_image_width = 0;
-  graphic_info[graphic].src_image_height = 0;
-  graphic_info[graphic].src_x = 0;
-  graphic_info[graphic].src_y = 0;
-  graphic_info[graphic].width  = TILEX;	/* default for element graphics */
-  graphic_info[graphic].height = TILEY;	/* default for element graphics */
-  graphic_info[graphic].offset_x = 0;	/* one or both of these values ... */
-  graphic_info[graphic].offset_y = 0;	/* ... will be corrected later */
-  graphic_info[graphic].offset2_x = 0;	/* one or both of these values ... */
-  graphic_info[graphic].offset2_y = 0;	/* ... will be corrected later */
-  graphic_info[graphic].swap_double_tiles = -1;	/* auto-detect tile swapping */
-  graphic_info[graphic].crumbled_like = -1;	/* do not use clone element */
-  graphic_info[graphic].diggable_like = -1;	/* do not use clone element */
-  graphic_info[graphic].border_size = TILEX / 8;  /* "CRUMBLED" border size */
-  graphic_info[graphic].scale_up_factor = 1;	/* default: no scaling up */
-  graphic_info[graphic].clone_from = -1;	/* do not use clone graphic */
-  graphic_info[graphic].anim_delay_fixed = 0;
-  graphic_info[graphic].anim_delay_random = 0;
-  graphic_info[graphic].post_delay_fixed = 0;
-  graphic_info[graphic].post_delay_random = 0;
-  graphic_info[graphic].fade_mode = FADE_MODE_DEFAULT;
-  graphic_info[graphic].fade_delay = -1;
-  graphic_info[graphic].post_delay = -1;
-  graphic_info[graphic].auto_delay = -1;
-  graphic_info[graphic].align = ALIGN_CENTER;	/* default for title screens */
-  graphic_info[graphic].valign = VALIGN_MIDDLE;	/* default for title screens */
-  graphic_info[graphic].sort_priority = 0;	/* default for title screens */
-
-#if 1
-  /* optional zoom factor for scaling up the image to a larger size */
-  if (parameter[GFX_ARG_SCALE_UP_FACTOR] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].scale_up_factor = parameter[GFX_ARG_SCALE_UP_FACTOR];
-  if (graphic_info[graphic].scale_up_factor < 1)
-    graphic_info[graphic].scale_up_factor = 1;		/* no scaling */
-#endif
-
-#if 1
-  if (graphic_info[graphic].use_image_size)
-  {
-    /* set new default bitmap size (with scaling, but without small images) */
-    graphic_info[graphic].width  = get_scaled_graphic_width(graphic);
-    graphic_info[graphic].height = get_scaled_graphic_height(graphic);
-  }
-#endif
-
-  /* optional x and y tile position of animation frame sequence */
-  if (parameter[GFX_ARG_XPOS] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].src_x = parameter[GFX_ARG_XPOS] * TILEX;
-  if (parameter[GFX_ARG_YPOS] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].src_y = parameter[GFX_ARG_YPOS] * TILEY;
-
-  /* optional x and y pixel position of animation frame sequence */
-  if (parameter[GFX_ARG_X] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].src_x = parameter[GFX_ARG_X];
-  if (parameter[GFX_ARG_Y] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].src_y = parameter[GFX_ARG_Y];
-
-  /* optional width and height of each animation frame */
-  if (parameter[GFX_ARG_WIDTH] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].width = parameter[GFX_ARG_WIDTH];
-  if (parameter[GFX_ARG_HEIGHT] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].height = parameter[GFX_ARG_HEIGHT];
-
-#if 0
-  /* optional zoom factor for scaling up the image to a larger size */
-  if (parameter[GFX_ARG_SCALE_UP_FACTOR] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].scale_up_factor = parameter[GFX_ARG_SCALE_UP_FACTOR];
-  if (graphic_info[graphic].scale_up_factor < 1)
-    graphic_info[graphic].scale_up_factor = 1;		/* no scaling */
-#endif
-
-  if (src_bitmap)
-  {
-    /* get final bitmap size (with scaling, but without small images) */
-    int src_image_width  = get_scaled_graphic_width(graphic);
-    int src_image_height = get_scaled_graphic_height(graphic);
-
-    anim_frames_per_row = src_image_width  / graphic_info[graphic].width;
-    anim_frames_per_col = src_image_height / graphic_info[graphic].height;
-
-    graphic_info[graphic].src_image_width  = src_image_width;
-    graphic_info[graphic].src_image_height = src_image_height;
-  }
-
-  /* correct x or y offset dependent of vertical or horizontal frame order */
-  if (parameter[GFX_ARG_VERTICAL])	/* frames are ordered vertically */
-  {
-    graphic_info[graphic].offset_y =
-      (parameter[GFX_ARG_OFFSET] != ARG_UNDEFINED_VALUE ?
-       parameter[GFX_ARG_OFFSET] : graphic_info[graphic].height);
-    anim_frames_per_line = anim_frames_per_col;
-  }
-  else					/* frames are ordered horizontally */
-  {
-    graphic_info[graphic].offset_x =
-      (parameter[GFX_ARG_OFFSET] != ARG_UNDEFINED_VALUE ?
-       parameter[GFX_ARG_OFFSET] : graphic_info[graphic].width);
-    anim_frames_per_line = anim_frames_per_row;
-  }
-
-  /* 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];
-
-  /* optionally, moving animations may have separate start and end graphics */
-  graphic_info[graphic].double_movement = parameter[GFX_ARG_2ND_MOVEMENT_TILE];
-
-  if (parameter[GFX_ARG_2ND_VERTICAL] == ARG_UNDEFINED_VALUE)
-    parameter[GFX_ARG_2ND_VERTICAL] = !parameter[GFX_ARG_VERTICAL];
-
-  /* correct x or y offset2 dependent of vertical or horizontal frame order */
-  if (parameter[GFX_ARG_2ND_VERTICAL])	/* frames are ordered vertically */
-    graphic_info[graphic].offset2_y =
-      (parameter[GFX_ARG_2ND_OFFSET] != ARG_UNDEFINED_VALUE ?
-       parameter[GFX_ARG_2ND_OFFSET] : graphic_info[graphic].height);
-  else					/* frames are ordered horizontally */
-    graphic_info[graphic].offset2_x =
-      (parameter[GFX_ARG_2ND_OFFSET] != ARG_UNDEFINED_VALUE ?
-       parameter[GFX_ARG_2ND_OFFSET] : graphic_info[graphic].width);
-
-  /* optionally, the x and y offset of 2nd graphic can be specified directly */
-  if (parameter[GFX_ARG_2ND_XOFFSET] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].offset2_x = parameter[GFX_ARG_2ND_XOFFSET];
-  if (parameter[GFX_ARG_2ND_YOFFSET] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].offset2_y = parameter[GFX_ARG_2ND_YOFFSET];
-
-  /* optionally, the second movement tile can be specified as start tile */
-  if (parameter[GFX_ARG_2ND_SWAP_TILES] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].swap_double_tiles= parameter[GFX_ARG_2ND_SWAP_TILES];
-
-  /* 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 =	anim_frames_per_row;
-  else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL])
-    graphic_info[graphic].anim_frames =	anim_frames_per_col;
-  else
-    graphic_info[graphic].anim_frames = 1;
-
-  if (graphic_info[graphic].anim_frames == 0)	/* frames must be at least 1 */
-    graphic_info[graphic].anim_frames = 1;
-
-  graphic_info[graphic].anim_frames_per_line =
-    (parameter[GFX_ARG_FRAMES_PER_LINE] != ARG_UNDEFINED_VALUE ?
-     parameter[GFX_ARG_FRAMES_PER_LINE] : anim_frames_per_line);
-
-  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;
-
-  graphic_info[graphic].anim_mode = parameter[GFX_ARG_ANIM_MODE];
-#if 0
-  if (graphic_info[graphic].anim_frames == 1)
-    graphic_info[graphic].anim_mode = ANIM_NONE;
-#endif
-
-  /* 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];
-
-  /* optional element for cloning crumble graphics */
-  if (parameter[GFX_ARG_CRUMBLED_LIKE] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].crumbled_like = parameter[GFX_ARG_CRUMBLED_LIKE];
-
-  /* optional element for cloning digging graphics */
-  if (parameter[GFX_ARG_DIGGABLE_LIKE] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].diggable_like = parameter[GFX_ARG_DIGGABLE_LIKE];
-
-  /* optional border size for "crumbling" diggable graphics */
-  if (parameter[GFX_ARG_BORDER_SIZE] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].border_size = parameter[GFX_ARG_BORDER_SIZE];
-
-  /* this is only used for player "boring" and "sleeping" actions */
-  if (parameter[GFX_ARG_ANIM_DELAY_FIXED] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].anim_delay_fixed =
-      parameter[GFX_ARG_ANIM_DELAY_FIXED];
-  if (parameter[GFX_ARG_ANIM_DELAY_RANDOM] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].anim_delay_random =
-      parameter[GFX_ARG_ANIM_DELAY_RANDOM];
-  if (parameter[GFX_ARG_POST_DELAY_FIXED] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].post_delay_fixed =
-      parameter[GFX_ARG_POST_DELAY_FIXED];
-  if (parameter[GFX_ARG_POST_DELAY_RANDOM] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].post_delay_random =
-      parameter[GFX_ARG_POST_DELAY_RANDOM];
-
-  /* this is only used for toon animations */
-  graphic_info[graphic].step_offset = parameter[GFX_ARG_STEP_OFFSET];
-  graphic_info[graphic].step_delay  = parameter[GFX_ARG_STEP_DELAY];
-
-  /* this is only used for drawing font characters */
-  graphic_info[graphic].draw_xoffset = parameter[GFX_ARG_DRAW_XOFFSET];
-  graphic_info[graphic].draw_yoffset = parameter[GFX_ARG_DRAW_YOFFSET];
-
-  /* this is only used for drawing envelope graphics */
-  graphic_info[graphic].draw_masked = parameter[GFX_ARG_DRAW_MASKED];
-
-  /* optional graphic for cloning all graphics settings */
-  if (parameter[GFX_ARG_CLONE_FROM] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].clone_from = parameter[GFX_ARG_CLONE_FROM];
-
-  /* optional settings for drawing title screens and title messages */
-  if (parameter[GFX_ARG_FADE_MODE] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].fade_mode = parameter[GFX_ARG_FADE_MODE];
-  if (parameter[GFX_ARG_FADE_DELAY] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].fade_delay = parameter[GFX_ARG_FADE_DELAY];
-  if (parameter[GFX_ARG_POST_DELAY] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].post_delay = parameter[GFX_ARG_POST_DELAY];
-  if (parameter[GFX_ARG_AUTO_DELAY] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].auto_delay = parameter[GFX_ARG_AUTO_DELAY];
-  if (parameter[GFX_ARG_ALIGN] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].align = parameter[GFX_ARG_ALIGN];
-  if (parameter[GFX_ARG_VALIGN] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].valign = parameter[GFX_ARG_VALIGN];
-  if (parameter[GFX_ARG_SORT_PRIORITY] != ARG_UNDEFINED_VALUE)
-    graphic_info[graphic].sort_priority = parameter[GFX_ARG_SORT_PRIORITY];
-#endif
-
   UPDATE_BUSY_STATE();
 }
 
@@ -1812,14 +1307,6 @@ static void InitGraphicInfo()
   int num_images = getImageListSize();
   int i;
 
-#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
-  static boolean clipmasks_initialized = FALSE;
-  Pixmap src_pixmap;
-  XGCValues clip_gc_values;
-  unsigned long clip_gc_valuemask;
-  GC copy_clipmask_gc = None;
-#endif
-
   /* use image size as default values for width and height for these images */
   static int full_size_graphics[] =
   {
@@ -1830,12 +1317,14 @@ static void InitGraphicInfo()
     IMG_BACKGROUND_ENVELOPE_2,
     IMG_BACKGROUND_ENVELOPE_3,
     IMG_BACKGROUND_ENVELOPE_4,
+    IMG_BACKGROUND_REQUEST,
 
     IMG_BACKGROUND,
     IMG_BACKGROUND_TITLE_INITIAL,
     IMG_BACKGROUND_TITLE,
     IMG_BACKGROUND_MAIN,
     IMG_BACKGROUND_LEVELS,
+    IMG_BACKGROUND_LEVELNR,
     IMG_BACKGROUND_SCORES,
     IMG_BACKGROUND_EDITOR,
     IMG_BACKGROUND_INFO,
@@ -1843,9 +1332,15 @@ static void InitGraphicInfo()
     IMG_BACKGROUND_INFO_MUSIC,
     IMG_BACKGROUND_INFO_CREDITS,
     IMG_BACKGROUND_INFO_PROGRAM,
+    IMG_BACKGROUND_INFO_VERSION,
     IMG_BACKGROUND_INFO_LEVELSET,
     IMG_BACKGROUND_SETUP,
+    IMG_BACKGROUND_PLAYING,
     IMG_BACKGROUND_DOOR,
+    IMG_BACKGROUND_TAPE,
+    IMG_BACKGROUND_PANEL,
+    IMG_BACKGROUND_PALETTE,
+    IMG_BACKGROUND_TOOLBOX,
 
     IMG_TITLESCREEN_INITIAL_1,
     IMG_TITLESCREEN_INITIAL_2,
@@ -1858,6 +1353,17 @@ static void InitGraphicInfo()
     IMG_TITLESCREEN_4,
     IMG_TITLESCREEN_5,
 
+    IMG_BACKGROUND_TITLEMESSAGE_INITIAL_1,
+    IMG_BACKGROUND_TITLEMESSAGE_INITIAL_2,
+    IMG_BACKGROUND_TITLEMESSAGE_INITIAL_3,
+    IMG_BACKGROUND_TITLEMESSAGE_INITIAL_4,
+    IMG_BACKGROUND_TITLEMESSAGE_INITIAL_5,
+    IMG_BACKGROUND_TITLEMESSAGE_1,
+    IMG_BACKGROUND_TITLEMESSAGE_2,
+    IMG_BACKGROUND_TITLEMESSAGE_3,
+    IMG_BACKGROUND_TITLEMESSAGE_4,
+    IMG_BACKGROUND_TITLEMESSAGE_5,
+
     -1
   };
 
@@ -1865,7 +1371,6 @@ static void InitGraphicInfo()
 
   graphic_info = checked_calloc(num_images * sizeof(struct GraphicInfo));
 
-#if 1
   /* initialize "use_image_size" flag with default value */
   for (i = 0; i < num_images; i++)
     graphic_info[i].use_image_size = FALSE;
@@ -1873,23 +1378,6 @@ static void InitGraphicInfo()
   /* initialize "use_image_size" flag from static configuration above */
   for (i = 0; full_size_graphics[i] != -1; i++)
     graphic_info[full_size_graphics[i]].use_image_size = TRUE;
-#endif
-
-#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
-  if (clipmasks_initialized)
-  {
-    for (i = 0; i < num_images; 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);
-
-      graphic_info[i].clip_mask = None;
-      graphic_info[i].clip_gc = None;
-    }
-  }
-#endif
 
   /* first set all graphic paramaters ... */
   for (i = 0; i < num_images; i++)
@@ -1924,13 +1412,11 @@ static void InitGraphicInfo()
     /* check if first animation frame is inside specified bitmap */
 
     first_frame = 0;
-    getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
+    getFixedGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y);
 
-#if 1
     /* this avoids calculating wrong start position for out-of-bounds frame */
     src_x = graphic_info[i].src_x;
     src_y = graphic_info[i].src_y;
-#endif
 
     if (src_x < 0 || src_y < 0 ||
 	src_x + width  > src_bitmap_width ||
@@ -1958,7 +1444,7 @@ static void InitGraphicInfo()
     /* check if last animation frame is inside specified bitmap */
 
     last_frame = graphic_info[i].anim_frames - 1;
-    getGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y);
+    getFixedGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y);
 
     if (src_x < 0 || src_y < 0 ||
 	src_x + width  > src_bitmap_width ||
@@ -1972,6 +1458,7 @@ static void InitGraphicInfo()
       Error(ERR_INFO,
 	    "error: last animation frame (%d) out of bounds (%d, %d) [%d, %d]",
 	    last_frame, src_x, src_y, src_bitmap_width, src_bitmap_height);
+      Error(ERR_INFO, "::: %d, %d", width, height);
       Error(ERR_INFO, "custom graphic rejected for this element/action");
 
       if (i == fallback_graphic)
@@ -1982,41 +1469,48 @@ static void InitGraphicInfo()
 
       graphic_info[i] = graphic_info[fallback_graphic];
     }
+  }
+}
 
-#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
-    /* currently we only need 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);
-    }
+static void InitGraphicCompatibilityInfo()
+{
+  struct FileInfo *fi_global_door =
+    getImageListEntryFromImageID(IMG_GLOBAL_DOOR);
+  int num_images = getImageListSize();
+  int i;
 
-    graphic_info[i].clip_mask =
-      XCreatePixmap(display, window->drawable, TILEX, TILEY, 1);
+  /* the following compatibility handling is needed for the following case:
+     versions up to 3.3.0.0 used one large bitmap "global.door" for various
+     graphics mainly used for door and panel graphics, like editor, tape and
+     in-game buttons with hard-coded bitmap positions and button sizes; as
+     these graphics now have individual definitions, redefining "global.door"
+     to change all these graphics at once like before does not work anymore
+     (because all those individual definitions still have their default values);
+     to solve this, remap all those individual definitions that are not
+     redefined to the new bitmap of "global.door" if it was redefined */
 
-    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);
+  /* special compatibility handling if image "global.door" was redefined */
+  if (fi_global_door->redefined)
+  {
+    for (i = 0; i < num_images; i++)
+    {
+      struct FileInfo *fi = getImageListEntryFromImageID(i);
 
-    clip_gc_values.graphics_exposures = False;
-    clip_gc_values.clip_mask = graphic_info[i].clip_mask;
-    clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
+      /* process only those images that still use the default settings */
+      if (!fi->redefined)
+      {
+	/* process all images which default to same image as "global.door" */
+	if (strEqual(fi->default_filename, fi_global_door->default_filename))
+	{
+	  // printf("::: special treatment needed for token '%s'\n", fi->token);
 
-    graphic_info[i].clip_gc =
-      XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
-#endif
+	  graphic_info[i].bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
+	}
+      }
+    }
   }
 
-#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
-  if (copy_clipmask_gc)
-    XFreeGC(display, copy_clipmask_gc);
-
-  clipmasks_initialized = TRUE;
-#endif
+  InitGraphicCompatibilityInfo_Doors();
 }
 
 static void InitElementSoundInfo()
@@ -2101,19 +1595,10 @@ static void InitElementSoundInfo()
       if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].sound[act] != -1)
 	default_action_sound = element_info[EL_SB_DEFAULT].sound[act];
 
-      /* !!! there's no such thing as a "default action sound" !!! */
-#if 0
-      /* look for element specific default sound (independent from action) */
-      if (element_info[i].sound[ACTION_DEFAULT] != -1)
-	default_action_sound = element_info[i].sound[ACTION_DEFAULT];
-#endif
-
-#if 1
       /* !!! needed because EL_EMPTY_SPACE treated as IS_SP_ELEMENT !!! */
       /* !!! make this better !!! */
       if (i == EL_EMPTY_SPACE)
 	default_action_sound = element_info[EL_DEFAULT].sound[act];
-#endif
 
       /* no sound for this specific action -- use default action sound */
       if (element_info[i].sound[act] == -1)
@@ -2154,12 +1639,6 @@ static void InitGameModeSoundInfo()
   for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
     if (menu.sound[i] == -1)
       menu.sound[i] = menu.sound[GAME_MODE_DEFAULT];
-
-#if 0
-  for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
-    if (menu.sound[i] != -1)
-      printf("::: menu.sound[%d] == %d\n", i, menu.sound[i]);
-#endif
 }
 
 static void set_sound_parameters(int sound, char **parameter_raw)
@@ -2209,10 +1688,6 @@ static void InitSoundInfo()
     sound_effect_properties[i] = ACTION_OTHER;
     sound_info[i].loop = FALSE;		/* default: play sound only once */
 
-#if 0
-    printf("::: sound %d: '%s'\n", i, sound->token);
-#endif
-
     /* determine all loop sounds and identify certain sound classes */
 
     for (j = 0; element_action_info[j].suffix; j++)
@@ -2275,10 +1750,6 @@ static void InitGameModeMusicInfo()
     int gamemode = gamemode_to_music[i].gamemode;
     int music    = gamemode_to_music[i].music;
 
-#if 0
-    printf("::: gamemode == %d, music == %d\n", gamemode, music);
-#endif
-
     if (gamemode < 0)
       gamemode = GAME_MODE_DEFAULT;
 
@@ -2290,13 +1761,8 @@ static void InitGameModeMusicInfo()
   {
     int prefix   = property_mapping[i].base_index;
     int gamemode = property_mapping[i].ext1_index;
-    int level    = property_mapping[i].ext2_index;
-    int music    = property_mapping[i].artwork_index;
-
-#if 0
-    printf("::: prefix == %d, gamemode == %d, level == %d, music == %d\n",
-	   prefix, gamemode, level, music);
-#endif
+    int level    = property_mapping[i].ext2_index;
+    int music    = property_mapping[i].artwork_index;
 
     if (prefix < 0 || prefix >= NUM_MUSIC_PREFIXES)
       continue;
@@ -2329,15 +1795,6 @@ static void InitGameModeMusicInfo()
   for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
     if (menu.music[i] == -1)
       menu.music[i] = menu.music[GAME_MODE_DEFAULT];
-
-#if 0
-  for (i = 0; i < MAX_LEVELS; i++)
-    if (levelset.music[i] != -1)
-      printf("::: levelset.music[%d] == %d\n", i, levelset.music[i]);
-  for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
-    if (menu.music[i] != -1)
-      printf("::: menu.music[%d] == %d\n", i, menu.music[i]);
-#endif
 }
 
 static void set_music_parameters(int music, char **parameter_raw)
@@ -2397,6 +1854,8 @@ static void ReinitializeGraphics()
 {
   print_timestamp_init("ReinitializeGraphics");
 
+  InitGfxTileSizeInfo(game.tile_size, TILESIZE);
+
   InitGraphicInfo();			/* graphic properties mapping */
   print_timestamp_time("InitGraphicInfo");
   InitElementGraphicInfo();		/* element game graphic mapping */
@@ -2414,6 +1873,9 @@ static void ReinitializeGraphics()
   InitGraphicInfo_EM();			/* graphic mapping for EM engine */
   print_timestamp_time("InitGraphicInfo_EM");
 
+  InitGraphicCompatibilityInfo();
+  print_timestamp_time("InitGraphicCompatibilityInfo");
+
   SetMainBackgroundImage(IMG_BACKGROUND);
   print_timestamp_time("SetMainBackgroundImage");
   SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
@@ -2423,6 +1885,8 @@ static void ReinitializeGraphics()
   print_timestamp_time("InitGadgets");
   InitToons();
   print_timestamp_time("InitToons");
+  InitDoors();
+  print_timestamp_time("InitDoors");
 
   print_timestamp_done("ReinitializeGraphics");
 }
@@ -2820,8 +2284,12 @@ void InitElementPropertiesStatic()
     EL_SIGN_FRANKIE,
     EL_STEEL_EXIT_CLOSED,
     EL_STEEL_EXIT_OPEN,
+    EL_STEEL_EXIT_OPENING,
+    EL_STEEL_EXIT_CLOSING,
     EL_EM_STEEL_EXIT_CLOSED,
     EL_EM_STEEL_EXIT_OPEN,
+    EL_EM_STEEL_EXIT_OPENING,
+    EL_EM_STEEL_EXIT_CLOSING,
     EL_DC_STEELWALL_1_LEFT,
     EL_DC_STEELWALL_1_RIGHT,
     EL_DC_STEELWALL_1_TOP,
@@ -2894,18 +2362,14 @@ void InitElementPropertiesStatic()
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
     EL_SWITCHGATE_CLOSING,
-#if 1
     EL_DC_SWITCHGATE_SWITCH_UP,
     EL_DC_SWITCHGATE_SWITCH_DOWN,
-#endif
     EL_TIMEGATE_OPEN,
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
-#if 1
     EL_DC_TIMEGATE_SWITCH,
     EL_DC_TIMEGATE_SWITCH_ACTIVE,
-#endif
     EL_TUBE_ANY,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
@@ -3144,10 +2608,12 @@ void InitElementPropertiesStatic()
     EL_SOKOBAN_FIELD_EMPTY,
     EL_EXIT_OPEN,
     EL_EM_EXIT_OPEN,
+    EL_EM_EXIT_OPENING,
     EL_SP_EXIT_OPEN,
     EL_SP_EXIT_OPENING,
     EL_STEEL_EXIT_OPEN,
     EL_EM_STEEL_EXIT_OPEN,
+    EL_EM_STEEL_EXIT_OPENING,
     EL_GATE_1,
     EL_GATE_2,
     EL_GATE_3,
@@ -4159,6 +3625,7 @@ void InitElementPropertiesStatic()
     EL_PLAYER_2,
     EL_PLAYER_3,
     EL_PLAYER_4,
+    EL_SOKOBAN_FIELD_PLAYER,
     EL_SP_MURPHY,
     EL_YAMYAM,
     EL_YAMYAM_LEFT,
@@ -4817,15 +4284,9 @@ void InitElementPropertiesEngine(int engine_version)
 						  HAS_ACTION(i)));
 
     /* ---------- GFX_CRUMBLED --------------------------------------------- */
-#if 1
     SET_PROPERTY(i, EP_GFX_CRUMBLED,
 		 element_info[i].crumbled[ACTION_DEFAULT] !=
 		 element_info[i].graphic[ACTION_DEFAULT]);
-#else
-    /* !!! THIS LOOKS CRAPPY FOR SAND ETC. WITHOUT CRUMBLED GRAPHICS !!! */
-    SET_PROPERTY(i, EP_GFX_CRUMBLED,
-		 element_info[i].crumbled[ACTION_DEFAULT] != IMG_EMPTY);
-#endif
 
     /* ---------- EDITOR_CASCADE ------------------------------------------- */
     SET_PROPERTY(i, EP_EDITOR_CASCADE, (IS_EDITOR_CASCADE_ACTIVE(i) ||
@@ -4849,6 +4310,14 @@ void InitElementPropertiesEngine(int engine_version)
       -1
     };
 
+    static int ep_em_explodes_by_fire[] =
+    {
+      EL_EM_DYNAMITE,
+      EL_EM_DYNAMITE_ACTIVE,
+      EL_MOLE,
+      -1
+    };
+
     /* special EM style gems behaviour */
     for (i = 0; ep_em_slippery_wall[i] != -1; i++)
       SET_PROPERTY(ep_em_slippery_wall[i], EP_EM_SLIPPERY_WALL,
@@ -4858,6 +4327,11 @@ void InitElementPropertiesEngine(int engine_version)
     SET_PROPERTY(EL_EXPANDABLE_WALL_GROWING, EP_EM_SLIPPERY_WALL,
 		 (level.em_slippery_gems &&
 		  engine_version > VERSION_IDENT(2,0,1,0)));
+
+    /* special EM style explosion behaviour regarding chain reactions */
+    for (i = 0; ep_em_explodes_by_fire[i] != -1; i++)
+      SET_PROPERTY(ep_em_explodes_by_fire[i], EP_EXPLODES_BY_FIRE,
+		   level.em_explodes_by_fire);
   }
 
   /* this is needed because some graphics depend on element properties */
@@ -4884,6 +4358,18 @@ void InitElementPropertiesAfterLoading(int engine_version)
   }
 }
 
+void InitElementPropertiesGfxElement()
+{
+  int i;
+
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
+  {
+    struct ElementInfo *ei = &element_info[i];
+
+    ei->gfx_element = (ei->use_gfx_element ? ei->gfx_element_initial : i);
+  }
+}
+
 static void InitGlobal()
 {
   int graphic;
@@ -4898,10 +4384,6 @@ static void InitGlobal()
     element_info[i].token_name = element_name_info[i].token_name;
     element_info[i].class_name = element_name_info[i].class_name;
     element_info[i].editor_description= element_name_info[i].editor_description;
-
-#if 0
-    printf("%04d: %s\n", i, element_name_info[i].token_name);
-#endif
   }
 
   /* create hash from image config list */
@@ -4921,7 +4403,8 @@ static void InitGlobal()
   /* create hash from graphic token list */
   graphic_token_hash = newSetupFileHash();
   for (graphic = 0, i = 0; image_config[i].token != NULL; i++)
-    if (strSuffix(image_config[i].value, ".pcx") ||
+    if (strSuffix(image_config[i].value, ".png") ||
+	strSuffix(image_config[i].value, ".pcx") ||
 	strSuffix(image_config[i].value, ".wav") ||
 	strEqual(image_config[i].value, UNDEFINED_FILENAME))
       setHashEntry(graphic_token_hash,
@@ -4976,16 +4459,15 @@ static void InitGlobal()
 
   global.autoplay_leveldir = NULL;
   global.convert_leveldir = NULL;
+  global.create_images_dir = NULL;
 
   global.frames_per_second = 0;
   global.fps_slowdown = FALSE;
   global.fps_slowdown_factor = 1;
 
   global.border_status = GAME_MODE_MAIN;
-#if 0
-  global.fading_status = GAME_MODE_MAIN;
-  global.fading_type = TYPE_ENTER_MENU;
-#endif
+
+  global.use_envelope_request = FALSE;
 }
 
 void Execute_Command(char *command)
@@ -5083,7 +4565,7 @@ void Execute_Command(char *command)
 
     exit(0);
   }
-  else if (strncmp(command, "dump level ", 11) == 0)
+  else if (strPrefix(command, "dump level "))
   {
     char *filename = &command[11];
 
@@ -5095,7 +4577,7 @@ void Execute_Command(char *command)
 
     exit(0);
   }
-  else if (strncmp(command, "dump tape ", 10) == 0)
+  else if (strPrefix(command, "dump tape "))
   {
     char *filename = &command[10];
 
@@ -5107,7 +4589,7 @@ void Execute_Command(char *command)
 
     exit(0);
   }
-  else if (strncmp(command, "autoplay ", 9) == 0)
+  else if (strPrefix(command, "autoplay "))
   {
     char *str_ptr = getStringCopy(&command[9]);	/* read command parameters */
 
@@ -5143,9 +4625,9 @@ void Execute_Command(char *command)
 	str_ptr++;
     }
   }
-  else if (strncmp(command, "convert ", 8) == 0)
+  else if (strPrefix(command, "convert "))
   {
-    char *str_copy = getStringCopy(&command[8]);
+    char *str_copy = getStringCopy(strchr(command, ' ') + 1);
     char *str_ptr = strchr(str_copy, ' ');
 
     global.convert_leveldir = str_copy;
@@ -5157,9 +4639,66 @@ void Execute_Command(char *command)
       global.convert_level_nr = atoi(str_ptr);	/* get level_nr value */
     }
   }
+  else if (strPrefix(command, "create images "))
+  {
+    global.create_images_dir = getStringCopy(&command[14]);
+
+    if (access(global.create_images_dir, W_OK) != 0)
+      Error(ERR_EXIT, "image target directory '%s' not found or not writable",
+	    global.create_images_dir);
+  }
 
 #if DEBUG
-#if defined(TARGET_SDL)
+#if defined(TARGET_SDL2)
+  else if (strEqual(command, "SDL_ListModes"))
+  {
+    SDL_Init(SDL_INIT_VIDEO);
+
+    int num_displays = SDL_GetNumVideoDisplays();
+
+    // check if there are any displays available
+    if (num_displays < 0)
+    {
+      printf("No displays available: %s\n", SDL_GetError());
+
+      exit(-1);
+    }
+
+    for (i = 0; i < num_displays; i++)
+    {
+      int num_modes = SDL_GetNumDisplayModes(i);
+      int j;
+
+      printf("Available display modes for display %d:\n", i);
+
+      // check if there are any display modes available for this display
+      if (num_modes < 0)
+      {
+	printf("No display modes available for display %d: %s\n",
+	       i, SDL_GetError());
+
+	exit(-1);
+      }
+
+      for (j = 0; j < num_modes; j++)
+      {
+	SDL_DisplayMode mode;
+
+	if (SDL_GetDisplayMode(i, j, &mode) < 0)
+	{
+	  printf("Cannot get display mode %d for display %d: %s\n",
+		 j, i, SDL_GetError());
+
+	  exit(-1);
+	}
+
+	printf("- %d x %d\n", mode.w, mode.h);
+      }
+    }
+
+    exit(0);
+  }
+#elif defined(TARGET_SDL)
   else if (strEqual(command, "SDL_ListModes"))
   {
     SDL_Rect **modes;
@@ -5185,10 +4724,10 @@ void Execute_Command(char *command)
     }
     else
     {
-      printf("Available Modes:\n");
+      printf("Available display modes:\n");
 
-      for(i = 0; modes[i]; i++)
-	printf("  %d x %d\n", modes[i]->w, modes[i]->h);
+      for (i = 0; modes[i]; i++)
+	printf("- %d x %d\n", modes[i]->w, modes[i]->h);
     }
 
     exit(0);
@@ -5256,28 +4795,6 @@ static char *get_level_id_suffix(int id_nr)
   return id_suffix;
 }
 
-#if 0
-static char *get_element_class_token(int element)
-{
-  char *element_class_name = element_info[element].class_name;
-  char *element_class_token = checked_malloc(strlen(element_class_name) + 3);
-
-  sprintf(element_class_token, "[%s]", element_class_name);
-
-  return element_class_token;
-}
-
-static char *get_action_class_token(int action)
-{
-  char *action_class_name = &element_action_info[action].suffix[1];
-  char *action_class_token = checked_malloc(strlen(action_class_name) + 3);
-
-  sprintf(action_class_token, "[%s]", action_class_name);
-
-  return action_class_token;
-}
-#endif
-
 static void InitArtworkConfig()
 {
   static char *image_id_prefix[MAX_NUM_ELEMENTS + NUM_FONTS + 1];
@@ -5388,6 +4905,32 @@ static void InitMixer()
   StartMixer();
 }
 
+void InitGfxBuffers()
+{
+  /* create additional image buffers for double-buffering and cross-fading */
+  ReCreateBitmap(&bitmap_db_store, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
+  ReCreateBitmap(&bitmap_db_cross, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
+  ReCreateBitmap(&bitmap_db_field, FXSIZE, FYSIZE, DEFAULT_DEPTH);
+  ReCreateBitmap(&bitmap_db_panel, DXSIZE, DYSIZE, DEFAULT_DEPTH);
+  ReCreateBitmap(&bitmap_db_door_1, 3 * DXSIZE, DYSIZE, DEFAULT_DEPTH);
+  ReCreateBitmap(&bitmap_db_door_2, 3 * VXSIZE, VYSIZE, DEFAULT_DEPTH);
+  ReCreateBitmap(&bitmap_db_toons, FULL_SXSIZE, FULL_SYSIZE, DEFAULT_DEPTH);
+
+  /* initialize screen properties */
+  InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE,
+		   REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
+		   bitmap_db_field);
+  InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE);
+  InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE);
+  InitGfxDoor3Info(EX, EY, EXSIZE, EYSIZE);
+  InitGfxWindowInfo(WIN_XSIZE, WIN_YSIZE);
+  InitGfxScrollbufferInfo(FXSIZE, FYSIZE);
+  InitGfxClipRegion(FALSE, -1, -1, -1, -1);
+
+  InitGfxBuffers_EM();
+  InitGfxBuffers_SP();
+}
+
 void InitGfx()
 {
   struct GraphicInfo *graphic_info_last = graphic_info;
@@ -5434,20 +4977,7 @@ void InitGfx()
   if (filename_font_initial == NULL)	/* should not happen */
     Error(ERR_EXIT, "cannot get filename for '%s'", CONFIG_TOKEN_FONT_INITIAL);
 
-  /* create additional image buffers for double-buffering and cross-fading */
-  bitmap_db_cross = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
-  bitmap_db_field = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
-  bitmap_db_panel = CreateBitmap(DXSIZE, DYSIZE, DEFAULT_DEPTH);
-  bitmap_db_door  = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
-  bitmap_db_toons = CreateBitmap(FULL_SXSIZE, FULL_SYSIZE, DEFAULT_DEPTH);
-
-  /* initialize screen properties */
-  InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE,
-		   REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
-		   bitmap_db_field);
-  InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE);
-  InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE);
-  InitGfxScrollbufferInfo(FXSIZE, FYSIZE);
+  InitGfxBuffers();
   InitGfxCustomArtworkInfo();
 
   bitmap_font_initial = LoadCustomImage(filename_font_initial);
@@ -5459,29 +4989,19 @@ void InitGfx()
 
   font_height = getFontHeight(FC_RED);
 
-#if 1
-  DrawInitText(getWindowTitleString(), 20, FC_YELLOW);
-#else
-  DrawInitText(getProgramInitString(), 20, FC_YELLOW);
-#endif
-  DrawInitText(PROGRAM_COPYRIGHT_STRING, 50, FC_RED);
-  DrawInitText(PROGRAM_WEBSITE_STRING, WIN_YSIZE - 20 - font_height, FC_RED);
+  DrawInitTextAlways(getProgramInitString(), 20, FC_YELLOW);
+  DrawInitTextAlways(PROGRAM_COPYRIGHT_STRING, 50, FC_RED);
+  DrawInitTextAlways(PROGRAM_WEBSITE_STRING, WIN_YSIZE - 20 - font_height,
+		     FC_RED);
 
-  DrawInitText("Loading graphics", 120, FC_GREEN);
+  DrawInitTextAlways("Loading graphics", 120, FC_GREEN);
 
-#if 1
-#if 1
   /* initialize busy animation with default values */
   int parameter[NUM_GFX_ARGS];
   for (i = 0; i < NUM_GFX_ARGS; i++)
     parameter[i] = get_graphic_parameter_value(image_config_suffix[i].value,
                                                image_config_suffix[i].token,
                                                image_config_suffix[i].type);
-#if 0
-  for (i = 0; i < NUM_GFX_ARGS; i++)
-    printf("::: '%s' => %d\n", image_config_suffix[i].token, parameter[i]);
-#endif
-#endif
 
   /* determine settings for busy animation (when displaying startup messages) */
   for (i = 0; image_config[i].token != NULL; i++)
@@ -5494,7 +5014,6 @@ void InitGfx()
     else if (strlen(image_config[i].token) > len_anim_token &&
 	     strncmp(image_config[i].token, anim_token, len_anim_token) == 0)
     {
-#if 1
       for (j = 0; image_config_suffix[j].token != NULL; j++)
       {
 	if (strEqual(&image_config[i].token[len_anim_token],
@@ -5504,23 +5023,6 @@ void InitGfx()
 					image_config_suffix[j].token,
 					image_config_suffix[j].type);
       }
-#else
-      if (strEqual(&image_config[i].token[len_anim_token], ".x"))
-	anim_initial.src_x = atoi(image_config[i].value);
-      else if (strEqual(&image_config[i].token[len_anim_token], ".y"))
-	anim_initial.src_y = atoi(image_config[i].value);
-      else if (strEqual(&image_config[i].token[len_anim_token], ".width"))
-	anim_initial.width = atoi(image_config[i].value);
-      else if (strEqual(&image_config[i].token[len_anim_token], ".height"))
-	anim_initial.height = atoi(image_config[i].value);
-      else if (strEqual(&image_config[i].token[len_anim_token], ".frames"))
-	anim_initial.anim_frames = atoi(image_config[i].value);
-      else if (strEqual(&image_config[i].token[len_anim_token],
-			".frames_per_line"))
-	anim_initial.anim_frames_per_line = atoi(image_config[i].value);
-      else if (strEqual(&image_config[i].token[len_anim_token], ".delay"))
-	anim_initial.anim_delay = atoi(image_config[i].value);
-#endif
     }
   }
 
@@ -5545,15 +5047,6 @@ void InitGfx()
 
   set_graphic_parameters_ext(0, parameter, anim_initial.bitmap);
 
-#if 0
-  printf("::: INIT_GFX: anim_frames_per_line == %d [%d / %d] [%d, %d]\n",
-	 graphic_info[0].anim_frames_per_line,
-	 get_scaled_graphic_width(0),
-	 graphic_info[0].width,
-	 getOriginalImageWidthFromImageID(0),
-	 graphic_info[0].scale_up_factor);
-#endif
-
   graphic_info = graphic_info_last;
 
   init.busy.width  = anim_initial.width;
@@ -5561,7 +5054,9 @@ void InitGfx()
 
   InitMenuDesignSettings_Static();
   InitGfxDrawBusyAnimFunction(DrawInitAnim);
-#endif
+
+  /* use copy of busy animation to prevent change while reloading artwork */
+  init_last = init;
 }
 
 void RedrawBackground()
@@ -5579,14 +5074,7 @@ void InitGfxBackground()
   fieldbuffer = bitmap_db_field;
   SetDrawtoField(DRAW_BACKBUFFER);
 
-#if 1
   ClearRectangle(backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE);
-#else
-  RedrawBackground();
-
-  ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
-  ClearRectangle(bitmap_db_door, 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE);
-#endif
 
   for (x = 0; x < MAX_BUF_XSIZE; x++)
     for (y = 0; y < MAX_BUF_YSIZE; y++)
@@ -5758,71 +5246,94 @@ static boolean CheckArtworkConfigForCustomElements(char *filename)
   return redefined_ce_found;
 }
 
-static void InitOverrideArtwork()
+static boolean CheckArtworkTypeForRedefinedCustomElements(int type)
 {
-  boolean init_override_from_setup = TRUE;
-
-  gfx.override_level_graphics = FALSE;
-  gfx.override_level_sounds   = FALSE;
-  gfx.override_level_music    = FALSE;
-
-  if (setup.auto_override_artwork)
-  {
-    char *filename_base, *filename_local;
-    boolean redefined_ce_found = FALSE;
+  char *filename_base, *filename_local;
+  boolean redefined_ce_found = FALSE;
 
-    setLevelArtworkDir(artwork.gfx_first);
+  setLevelArtworkDir(ARTWORK_FIRST_NODE(artwork, type));
 
 #if 0
-    printf("::: leveldir_current->identifier == '%s'\n",
-	   leveldir_current == NULL ? "[NULL]" : leveldir_current->identifier);
-    printf("::: leveldir_current->graphics_path == '%s'\n",
-	   leveldir_current == NULL ? "[NULL]" : leveldir_current->graphics_path);
-    printf("::: leveldir_current->graphics_set == '%s'\n",
-	   leveldir_current == NULL ? "[NULL]" : leveldir_current->graphics_set);
-    printf("::: getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS) == '%s'\n",
-	   leveldir_current == NULL ? "[NULL]" : LEVELDIR_ARTWORK_SET(leveldir_current, ARTWORK_TYPE_GRAPHICS));
+  printf("::: leveldir_current->identifier == '%s'\n",
+	 leveldir_current == NULL ? "[NULL]" : leveldir_current->identifier);
+  printf("::: leveldir_current->graphics_path == '%s'\n",
+	 leveldir_current == NULL ? "[NULL]" : leveldir_current->graphics_path);
+  printf("::: leveldir_current->graphics_set == '%s'\n",
+	 leveldir_current == NULL ? "[NULL]" : leveldir_current->graphics_set);
+  printf("::: getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS) == '%s'\n",
+	 leveldir_current == NULL ? "[NULL]" :
+	 LEVELDIR_ARTWORK_SET(leveldir_current, type));
 #endif
 
-    /* first look for special artwork configured in level series config */
-    filename_base = getCustomArtworkLevelConfigFilename(ARTWORK_TYPE_GRAPHICS);
+  /* first look for special artwork configured in level series config */
+  filename_base = getCustomArtworkLevelConfigFilename(type);
 
 #if 0
-    printf("::: filename_base == '%s'\n", filename_base);
+  printf("::: filename_base == '%s'\n", filename_base);
 #endif
 
-    if (fileExists(filename_base))
-      redefined_ce_found |= CheckArtworkConfigForCustomElements(filename_base);
+  if (fileExists(filename_base))
+    redefined_ce_found |= CheckArtworkConfigForCustomElements(filename_base);
 
-    filename_local = getCustomArtworkConfigFilename(ARTWORK_TYPE_GRAPHICS);
+  filename_local = getCustomArtworkConfigFilename(type);
 
 #if 0
-    printf("::: filename_local == '%s'\n", filename_local);
+  printf("::: filename_local == '%s'\n", filename_local);
 #endif
 
-    if (filename_local != NULL && !strEqual(filename_base, filename_local))
-      redefined_ce_found |= CheckArtworkConfigForCustomElements(filename_local);
+  if (filename_local != NULL && !strEqual(filename_base, filename_local))
+    redefined_ce_found |= CheckArtworkConfigForCustomElements(filename_local);
 
 #if 0
-    printf("::: redefined_ce_found == %d\n", redefined_ce_found);
+  printf("::: redefined_ce_found == %d\n", redefined_ce_found);
 #endif
 
-    if (!redefined_ce_found)
-    {
-      gfx.override_level_graphics = TRUE;
-      gfx.override_level_sounds   = TRUE;
-      gfx.override_level_music    = TRUE;
+  return redefined_ce_found;
+}
 
-      init_override_from_setup = FALSE;
-    }
-  }
+static void InitOverrideArtwork()
+{
+  boolean redefined_ce_found = FALSE;
+
+  /* to check if this level set redefines any CEs, do not use overriding */
+  gfx.override_level_graphics = FALSE;
+  gfx.override_level_sounds   = FALSE;
+  gfx.override_level_music    = FALSE;
+
+  /* now check if this level set has definitions for custom elements */
+  if (setup.override_level_graphics == AUTO ||
+      setup.override_level_sounds   == AUTO ||
+      setup.override_level_music    == AUTO)
+    redefined_ce_found =
+      (CheckArtworkTypeForRedefinedCustomElements(ARTWORK_TYPE_GRAPHICS) |
+       CheckArtworkTypeForRedefinedCustomElements(ARTWORK_TYPE_SOUNDS) |
+       CheckArtworkTypeForRedefinedCustomElements(ARTWORK_TYPE_MUSIC));
+
+#if 0
+  printf("::: redefined_ce_found == %d\n", redefined_ce_found);
+#endif
 
-  if (init_override_from_setup)
+  if (redefined_ce_found)
+  {
+    /* this level set has CE definitions: change "AUTO" to "FALSE" */
+    gfx.override_level_graphics = (setup.override_level_graphics == TRUE);
+    gfx.override_level_sounds   = (setup.override_level_sounds   == TRUE);
+    gfx.override_level_music    = (setup.override_level_music    == TRUE);
+  }
+  else
   {
-    gfx.override_level_graphics = setup.override_level_graphics;
-    gfx.override_level_sounds   = setup.override_level_sounds;
-    gfx.override_level_music    = setup.override_level_music;
+    /* this level set has no CE definitions: change "AUTO" to "TRUE" */
+    gfx.override_level_graphics = (setup.override_level_graphics != FALSE);
+    gfx.override_level_sounds   = (setup.override_level_sounds   != FALSE);
+    gfx.override_level_music    = (setup.override_level_music    != FALSE);
   }
+
+#if 0
+  printf("::: => %d, %d, %d\n",
+	 gfx.override_level_graphics,
+	 gfx.override_level_sounds,
+	 gfx.override_level_music);
+#endif
 }
 
 static char *getNewArtworkIdentifier(int type)
@@ -5832,19 +5343,11 @@ static char *getNewArtworkIdentifier(int type)
   static boolean last_has_level_artwork_set[3] = { FALSE, FALSE, FALSE };
   static boolean initialized[3] = { FALSE, FALSE, FALSE };
   TreeInfo *artwork_first_node = ARTWORK_FIRST_NODE(artwork, type);
-#if 1
   boolean setup_override_artwork = GFX_OVERRIDE_ARTWORK(type);
-#else
-  boolean setup_override_artwork = SETUP_OVERRIDE_ARTWORK(setup, type);
-#endif
   char *setup_artwork_set = SETUP_ARTWORK_SET(setup, type);
   char *leveldir_identifier = leveldir_current->identifier;
-#if 1
   /* !!! setLevelArtworkDir() should be moved to an earlier stage !!! */
   char *leveldir_artwork_set = setLevelArtworkDir(artwork_first_node);
-#else
-  char *leveldir_artwork_set = LEVELDIR_ARTWORK_SET(leveldir_current, type);
-#endif
   boolean has_level_artwork_set = (leveldir_artwork_set != NULL);
   char *artwork_current_identifier;
   char *artwork_new_identifier = NULL;	/* default: nothing has changed */
@@ -5874,16 +5377,6 @@ static char *getNewArtworkIdentifier(int type)
   /* 2nd step: check if it is really needed to reload artwork set
      ------------------------------------------------------------ */
 
-#if 0
-  if (type == ARTWORK_TYPE_GRAPHICS)
-    printf("::: 0: '%s' ['%s', '%s'] ['%s' ('%s')]\n",
-	   artwork_new_identifier,
-	   ARTWORK_CURRENT_IDENTIFIER(artwork, type),
-	   artwork_current_identifier,
-	   leveldir_current->graphics_set,
-	   leveldir_current->identifier);
-#endif
-
   /* ---------- reload if level set and also artwork set has changed ------- */
   if (leveldir_current_identifier[type] != leveldir_identifier &&
       (last_has_level_artwork_set[type] || has_level_artwork_set))
@@ -5892,22 +5385,12 @@ static char *getNewArtworkIdentifier(int type)
   leveldir_current_identifier[type] = leveldir_identifier;
   last_has_level_artwork_set[type] = has_level_artwork_set;
 
-#if 0
-  if (type == ARTWORK_TYPE_GRAPHICS)
-    printf("::: 1: '%s'\n", artwork_new_identifier);
-#endif
-
   /* ---------- reload if "override artwork" setting has changed ----------- */
   if (last_override_level_artwork[type] != setup_override_artwork)
     artwork_new_identifier = artwork_current_identifier;
 
   last_override_level_artwork[type] = setup_override_artwork;
 
-#if 0
-  if (type == ARTWORK_TYPE_GRAPHICS)
-    printf("::: 2: '%s'\n", artwork_new_identifier);
-#endif
-
   /* ---------- reload if current artwork identifier has changed ----------- */
   if (!strEqual(ARTWORK_CURRENT_IDENTIFIER(artwork, type),
 		artwork_current_identifier))
@@ -5915,30 +5398,12 @@ static char *getNewArtworkIdentifier(int type)
 
   *(ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type))= artwork_current_identifier;
 
-#if 0
-  if (type == ARTWORK_TYPE_GRAPHICS)
-    printf("::: 3: '%s'\n", artwork_new_identifier);
-#endif
-
   /* ---------- do not reload directly after starting ---------------------- */
   if (!initialized[type])
     artwork_new_identifier = NULL;
 
   initialized[type] = TRUE;
 
-#if 0
-  if (type == ARTWORK_TYPE_GRAPHICS)
-    printf("::: 4: '%s'\n", artwork_new_identifier);
-#endif
-
-#if 0
-  if (type == ARTWORK_TYPE_GRAPHICS)
-    printf("CHECKING OLD/NEW GFX:\n- OLD: %s\n- NEW: %s ['%s', '%s'] ['%s']\n",
-	   artwork.gfx_current_identifier, artwork_current_identifier,
-	   artwork.gfx_current->identifier, leveldir_current->graphics_set,
-	   artwork_new_identifier);
-#endif
-
   return artwork_new_identifier;
 }
 
@@ -5974,20 +5439,10 @@ void ReloadCustomArtwork(int force_reload)
 
   FadeOut(REDRAW_ALL);
 
-#if 1
   ClearRectangle(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
-#else
-  ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
-#endif
   print_timestamp_time("ClearRectangle");
 
-#if 0
-  printf("::: fading in ... %d\n", fading.fade_mode);
-#endif
   FadeIn(REDRAW_ALL);
-#if 0
-  printf("::: done\n");
-#endif
 
   if (gfx_new_identifier != NULL || force_reload_gfx)
   {
@@ -6017,18 +5472,9 @@ void ReloadCustomArtwork(int force_reload)
 
   game_status = last_game_status;	/* restore current game status */
 
-#if 0
-  printf("::: ----------------DELAY 1 ...\n");
-  Delay(3000);
-#endif
+  init_last = init;			/* switch to new busy animation */
 
-#if 0
-  printf("::: FadeOut @ ReloadCustomArtwork ...\n");
-#endif
   FadeOut(REDRAW_ALL);
-#if 0
-  printf("::: FadeOut @ ReloadCustomArtwork done\n");
-#endif
 
   RedrawBackground();
 
@@ -6036,25 +5482,12 @@ void ReloadCustomArtwork(int force_reload)
   SetDoorState(DOOR_OPEN_ALL);
   CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
 
-#if 1
-#if 1
-#if 1
   FadeSetEnterScreen();
   FadeSkipNextFadeOut();
-  // FadeSetDisabled();
-#else
-  FadeSkipNext();
-#endif
-#else
-  fading = fading_none;
-#endif
-#endif
-
-#if 0
-  redraw_mask = REDRAW_ALL;
-#endif
 
   print_timestamp_done("ReloadCustomArtwork");
+
+  LimitScreenUpdates(FALSE);
 }
 
 void KeyboardAutoRepeatOffUnlessAutoplay()
@@ -6063,6 +5496,63 @@ void KeyboardAutoRepeatOffUnlessAutoplay()
     KeyboardAutoRepeatOff();
 }
 
+void DisplayExitMessage(char *format, va_list ap)
+{
+  // check if draw buffer and fonts for exit message are already available
+  if (drawto == NULL || font_initial[NUM_INITIAL_FONTS - 1].bitmap == NULL)
+    return;
+
+  int font_1 = FC_RED;
+  int font_2 = FC_YELLOW;
+  int font_3 = FC_BLUE;
+  int font_width = getFontWidth(font_2);
+  int font_height = getFontHeight(font_2);
+  int sx = SX;
+  int sy = SY;
+  int sxsize = WIN_XSIZE - 2 * sx;
+  int sysize = WIN_YSIZE - 2 * sy;
+  int line_length = sxsize / font_width;
+  int max_lines = sysize / font_height;
+  int num_lines_printed;
+
+  gfx.sx = sx;
+  gfx.sy = sy;
+  gfx.sxsize = sxsize;
+  gfx.sysize = sysize;
+
+  sy = 20;
+
+  ClearRectangle(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
+
+  DrawTextSCentered(sy, font_1, "Fatal error:");
+  sy += 3 * font_height;;
+
+  num_lines_printed =
+    DrawTextBufferVA(sx, sy, format, ap, font_2,
+		     line_length, line_length, max_lines,
+		     0, BLIT_ON_BACKGROUND, TRUE, TRUE, FALSE);
+  sy += (num_lines_printed + 3) * font_height;
+
+  DrawTextSCentered(sy, font_1, "For details, see the following error file:");
+  sy += 3 * font_height;
+
+  num_lines_printed =
+    DrawTextBuffer(sx, sy, program.error_filename, font_2,
+		   line_length, line_length, max_lines,
+		   0, BLIT_ON_BACKGROUND, TRUE, TRUE, FALSE);
+
+  DrawTextSCentered(SYSIZE - 20, font_3, "Press any key or button to exit");
+
+  redraw_mask = REDRAW_ALL;
+
+  BackToFront();
+
+  /* deactivate toons on error message screen */
+  setup.toons = FALSE;
+
+  WaitForEventToContinue();
+}
+
 
 /* ========================================================================= */
 /* OpenAll()                                                                 */
@@ -6074,8 +5564,12 @@ void OpenAll()
 
   game_status = GAME_MODE_LOADING;
 
+  InitCounter();
+
   InitGlobal();			/* initialize some global variables */
 
+  print_timestamp_time("[init global stuff]");
+
   if (options.execute_command)
     Execute_Command(options.execute_command);
 
@@ -6092,30 +5586,38 @@ void OpenAll()
 
   InitSetup();
 
+  print_timestamp_time("[init setup/config stuff (1)]");
+
   InitGameInfo();
+  print_timestamp_time("[init setup/config stuff (2)]");
   InitPlayerInfo();
+  print_timestamp_time("[init setup/config stuff (3)]");
   InitArtworkInfo();		/* needed before loading gfx, sound & music */
+  print_timestamp_time("[init setup/config stuff (4)]");
   InitArtworkConfig();		/* needed before forking sound child process */
+  print_timestamp_time("[init setup/config stuff (5)]");
   InitMixer();
-
-  InitCounter();
+  print_timestamp_time("[init setup/config stuff (6)]");
 
   InitRND(NEW_RANDOMIZE);
   InitSimpleRandom(NEW_RANDOMIZE);
 
   InitJoysticks();
 
-  print_timestamp_time("[pre-video]");
+  print_timestamp_time("[init setup/config stuff]");
 
   InitVideoDisplay();
   InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen);
 
-  InitEventFilter(FilterMouseMotionEvents);
+  InitEventFilter(FilterEvents);
+
+  print_timestamp_time("[init video stuff]");
 
   InitElementPropertiesStatic();
   InitElementPropertiesEngine(GAME_VERSION_ACTUAL);
+  InitElementPropertiesGfxElement();
 
-  print_timestamp_time("[post-video]");
+  print_timestamp_time("[init element properties stuff]");
 
   InitGfx();
 
@@ -6141,9 +5643,8 @@ void OpenAll()
 
   InitGfxBackground();
 
-#if 1
   em_open_all();
-#endif
+  sp_open_all();
 
   if (global.autoplay_leveldir)
   {
@@ -6155,17 +5656,17 @@ void OpenAll()
     ConvertLevels();
     return;
   }
+  else if (global.create_images_dir)
+  {
+    CreateLevelSketchImages();
+    return;
+  }
 
   game_status = GAME_MODE_MAIN;
 
-#if 1
   FadeSetEnterScreen();
   if (!(fading.fade_mode & FADE_TYPE_TRANSFORM))
     FadeSkipNextFadeOut();
-  // FadeSetDisabled();
-#else
-  fading = fading_none;
-#endif
 
   print_timestamp_time("[post-artwork]");
 
@@ -6174,6 +5675,24 @@ void OpenAll()
   DrawMainMenu();
 
   InitNetworkServer();
+
+#if 0
+  Error(ERR_DEBUG, "::: SDL_GetBasePath() == '%s'",
+	SDL_GetBasePath());
+  Error(ERR_DEBUG, "::: SDL_GetPrefPath() == '%s'",
+	SDL_GetPrefPath("artsoft", "rocksndiamonds"));
+#if defined(PLATFORM_ANDROID)
+  Error(ERR_DEBUG, "::: SDL_AndroidGetInternalStoragePath() == '%s'",
+	SDL_AndroidGetInternalStoragePath());
+  Error(ERR_DEBUG, "::: SDL_AndroidGetExternalStoragePath() == '%s'",
+	SDL_AndroidGetExternalStoragePath());
+  Error(ERR_DEBUG, "::: SDL_AndroidGetExternalStorageState() == '%s'",
+	(SDL_AndroidGetExternalStorageState() ==
+	 SDL_ANDROID_EXTERNAL_STORAGE_READ ? "read" :
+	 SDL_AndroidGetExternalStorageState() ==
+	 SDL_ANDROID_EXTERNAL_STORAGE_WRITE ? "write" : "not available"));
+#endif
+#endif
 }
 
 void CloseAllAndExit(int exit_value)
@@ -6183,22 +5702,34 @@ void CloseAllAndExit(int exit_value)
   FreeAllMusic();
   CloseAudio();		/* called after freeing sounds (needed for SDL) */
 
-#if 1
   em_close_all();
-#endif
+  sp_close_all();
 
   FreeAllImages();
 
 #if defined(TARGET_SDL)
+#if defined(TARGET_SDL2)
+  // !!! TODO !!!
+  // set a flag to tell the network server thread to quit and wait for it
+  // using SDL_WaitThread()
+#else
   if (network_server)	/* terminate network server */
     SDL_KillThread(server_thread);
+#endif
 #endif
 
   CloseVideoDisplay();
   ClosePlatformDependentStuff();
 
   if (exit_value != 0)
-    NotifyUserAboutErrorFile();
+  {
+    /* fall back to default level set (current set may have caused an error) */
+    SaveLevelSetup_LastSeries_Deactivate();
+
+    /* tell user where to find error log file which may contain more details */
+    // (error notification now directly displayed on screen inside R'n'D
+    // NotifyUserAboutErrorFile();	/* currently only works for Windows */
+  }
 
   exit(exit_value);
 }