rnd-20131212-1-src

[rocksndiamonds.git] / src / libgame / image.c

diff --git a/src/libgame/image.c b/src/libgame/image.c
index 498c1c0bfb3a2c034cda879797ac2401e9cb54d8..50dce1d713b0df9c49b12be304610cf013adecdb 100644 (file)
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -832,7 +832,11 @@ typedef struct ImageInfo ImageInfo;
 
 static struct ArtworkListInfo *image_info = NULL;
 
+#if 1
+static void *Load_Image(char *filename)
+#else
 static void *Load_PCX(char *filename)
+#endif
 {
   ImageInfo *img_info;
 
@@ -1030,7 +1034,11 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
 
   /* ---------- initialize artwork loading/freeing functions ---------- */
 
+#if 1
+  image_info->load_artwork = Load_Image;
+#else
   image_info->load_artwork = Load_PCX;
+#endif
   image_info->free_artwork = FreeImage;
 }
 
@@ -1040,8 +1048,15 @@ void ReloadCustomImages()
   printf("::: reloading images '%s' ...\n", artwork.gfx_current_identifier);
 #endif
 
+  print_timestamp_init("ReloadCustomImages");
+
   LoadArtworkConfig(image_info);
+  print_timestamp_time("LoadArtworkConfig");
+
   ReloadCustomArtworkList(image_info);
+  print_timestamp_time("ReloadCustomArtworkList");
+
+  print_timestamp_done("ReloadCustomImages");
 }
 
 void CreateImageWithSmallImages(int pos, int zoom_factor)