major cleanup of preprocessor hell

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

diff --git a/src/libgame/image.c b/src/libgame/image.c
index 7f8302fcc2605101fdaae9f404367b7272dbe26f..4546d43646cf194567c46783810a15fecfff5507 100644 (file)
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -1,15 +1,13 @@
-/***********************************************************
-* Artsoft Retro-Game Library                               *
-*----------------------------------------------------------*
-* (c) 1994-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* image.c                                                  *
-***********************************************************/
+// ============================================================================
+// Artsoft Retro-Game Library
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//                         Holger Schemel
+//                 info@artsoft.org
+//                 http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// image.c
+// ============================================================================
 
 #include "image.h"
 #include "misc.h"
@@ -33,18 +31,10 @@ 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;
 
-#if 0
-  printf("::: loading PCX file '%s'\n", filename);
-#endif
-
   img_info = checked_calloc(sizeof(ImageInfo));
 
   if ((img_info->bitmap = LoadImage(filename)) == NULL)
@@ -235,20 +225,12 @@ 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;
 }
 
 void ReloadCustomImages()
 {
-#if 0
-  printf("::: reloading images '%s' ...\n", artwork.gfx_current_identifier);
-#endif
-
   print_timestamp_init("ReloadCustomImages");
 
   LoadArtworkConfig(image_info);