X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=aeb115ef7ec9d5eda62550c1221e3a3cac274392;hb=8f2ef74a99b89cd99d887f5b8e8e92c988676724;hp=614bb613cec6cc7185c78f423daca63193f7d89d;hpb=8afc6199767a6fcb7451efd2b3d5b070f6c99efb;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 614bb613..aeb115ef 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -462,10 +462,14 @@ char *getCustomImageFilename(char *basename) if (fileExists(filename)) return filename; + free(filename); + /* 2nd try: look for special artwork in current level series directory */ filename = getPath3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename); if (fileExists(filename)) return filename; + + free(filename); } /* 3rd try: look for special artwork in configured artwork directory */ @@ -473,11 +477,15 @@ char *getCustomImageFilename(char *basename) if (fileExists(filename)) return filename; + free(filename); + /* 4th try: look for default artwork in new default artwork directory */ filename = getPath2(getDefaultGraphicsDir(GRAPHICS_SUBDIR), basename); if (fileExists(filename)) return filename; + free(filename); + /* 5th try: look for default artwork in old default artwork directory */ filename = getPath2(options.graphics_directory, basename); if (fileExists(filename)) @@ -500,10 +508,14 @@ char *getCustomSoundFilename(char *basename) if (fileExists(filename)) return filename; + free(filename); + /* 2nd try: look for special artwork in current level series directory */ filename = getPath3(getCurrentLevelDir(), SOUNDS_DIRECTORY, basename); if (fileExists(filename)) return filename; + + free(filename); } /* 3rd try: look for special artwork in configured artwork directory */ @@ -511,11 +523,15 @@ char *getCustomSoundFilename(char *basename) if (fileExists(filename)) return filename; + free(filename); + /* 4th try: look for default artwork in new default artwork directory */ filename = getPath2(getDefaultSoundsDir(SOUNDS_SUBDIR), basename); if (fileExists(filename)) return filename; + free(filename); + /* 5th try: look for default artwork in old default artwork directory */ filename = getPath2(options.sounds_directory, basename); if (fileExists(filename)) @@ -553,10 +569,14 @@ char *getCustomMusicDirectory(void) if (fileExists(directory)) return directory; + free(directory); + /* 2nd try: look for special artwork in current level series directory */ directory = getPath2(getCurrentLevelDir(), MUSIC_DIRECTORY); if (fileExists(directory)) return directory; + + free(directory); } /* 3rd try: look for special artwork in configured artwork directory */ @@ -564,11 +584,15 @@ char *getCustomMusicDirectory(void) if (fileExists(directory)) return directory; + free(directory); + /* 4th try: look for default artwork in new default artwork directory */ directory = getStringCopy(getDefaultMusicDir(MUSIC_SUBDIR)); if (fileExists(directory)) return directory; + free(directory); + /* 5th try: look for default artwork in old default artwork directory */ directory = getStringCopy(options.music_directory); if (fileExists(directory))