X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=5ace5922af201154ff5f96f9f0385a868365072a;hb=4fb7d637c3bcc3381918636fdd22733ff7bae3ac;hp=591ea7d444ce3ecbe416fe96cbcc2b39c5a03ef6;hpb=307b13d025b6b0a5011c74efa3a2c023d3986ebb;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 591ea7d4..5ace5922 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -598,7 +598,6 @@ void LoadCustomMusic_NoConf(void) while ((dir_entry = readDirectory(dir)) != NULL) /* loop all entries */ { char *basename = dir_entry->basename; - char *filename = NULL; MusicInfo *mus_info = NULL; boolean music_already_used = FALSE; int i; @@ -621,12 +620,8 @@ void LoadCustomMusic_NoConf(void) if (draw_init_text) DrawInitText(basename, 150, FC_YELLOW); - filename = getPath2(music_directory, basename); - - if (FileIsMusic(basename)) - mus_info = Load_WAV_or_MOD(filename); - - free(filename); + if (FileIsMusic(dir_entry->filename)) + mus_info = Load_WAV_or_MOD(dir_entry->filename); if (mus_info) {