projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
major cleanup of preprocessor hell
[rocksndiamonds.git]
/
src
/
libgame
/
image.c
diff --git
a/src/libgame/image.c
b/src/libgame/image.c
index 885905d2f32e6061316196e8d7f522af57473429..4546d43646cf194567c46783810a15fecfff5507 100644
(file)
--- a/
src/libgame/image.c
+++ b/
src/libgame/image.c
@@
-31,18
+31,10
@@
typedef struct ImageInfo ImageInfo;
static struct ArtworkListInfo *image_info = NULL;
static struct ArtworkListInfo *image_info = NULL;
-#if 1
static void *Load_Image(char *filename)
static void *Load_Image(char *filename)
-#else
-static void *Load_PCX(char *filename)
-#endif
{
ImageInfo *img_info;
{
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)
img_info = checked_calloc(sizeof(ImageInfo));
if ((img_info->bitmap = LoadImage(filename)) == NULL)
@@
-233,20
+225,12
@@
void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
/* ---------- initialize artwork loading/freeing functions ---------- */
/* ---------- initialize artwork loading/freeing functions ---------- */
-#if 1
image_info->load_artwork = Load_Image;
image_info->load_artwork = Load_Image;
-#else
- image_info->load_artwork = Load_PCX;
-#endif
image_info->free_artwork = FreeImage;
}
void ReloadCustomImages()
{
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);
print_timestamp_init("ReloadCustomImages");
LoadArtworkConfig(image_info);