X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=e8e99a382d2f1b109083b7e94705d0b2e1db2da3;hb=56814df201c2d86273cf54e0e94c0448ce9bdd0f;hp=cb373a670777189f6e83394fc12c52b5c1d10305;hpb=2013cd2fd3007687dd843914059cf1118ee935fc;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index cb373a67..e8e99a38 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -518,7 +518,7 @@ char *getLevelSetTitleMessageFilename(int nr, boolean initial) basename = getLevelSetTitleMessageBasename(nr, initial); - if (!setup.override_level_graphics) + if (!gfx.override_level_graphics) { /* 1st try: look for special artwork in current level series directory */ filename = getPath3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename); @@ -615,7 +615,7 @@ char *getCustomImageFilename(char *basename) basename = getCorrectedArtworkBasename(basename); - if (!setup.override_level_graphics) + if (!gfx.override_level_graphics) { /* 1st try: look for special artwork in current level series directory */ filename = getPath3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename); @@ -664,6 +664,11 @@ char *getCustomImageFilename(char *basename) #if CREATE_SPECIAL_EDITION free(filename); + /* !!! INSERT WARNING HERE TO REPORT MISSING ARTWORK FILES !!! */ +#if 0 + printf("::: MISSING ARTWORK FILE '%s'\n", basename); +#endif + /* 6th try: look for fallback artwork in old default artwork directory */ /* (needed to prevent errors when trying to access unused artwork files) */ filename = getPath2(options.graphics_directory, GFX_FALLBACK_FILENAME); @@ -683,7 +688,7 @@ char *getCustomSoundFilename(char *basename) basename = getCorrectedArtworkBasename(basename); - if (!setup.override_level_sounds) + if (!gfx.override_level_sounds) { /* 1st try: look for special artwork in current level series directory */ filename = getPath3(getCurrentLevelDir(), SOUNDS_DIRECTORY, basename); @@ -751,7 +756,7 @@ char *getCustomMusicFilename(char *basename) basename = getCorrectedArtworkBasename(basename); - if (!setup.override_level_music) + if (!gfx.override_level_music) { /* 1st try: look for special artwork in current level series directory */ filename = getPath3(getCurrentLevelDir(), MUSIC_DIRECTORY, basename); @@ -845,7 +850,7 @@ char *getCustomMusicDirectory(void) checked_free(directory); - if (!setup.override_level_music) + if (!gfx.override_level_music) { /* 1st try: look for special artwork in current level series directory */ directory = getPath2(getCurrentLevelDir(), MUSIC_DIRECTORY);