X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=b9fd88c66a460dd72e58300cba60644236440794;hb=7892cce9f39489a779f8fad4a3e756b0bb8dbee5;hp=a70ea3accf9018ed7c264f76b6bc06f61a89f5b6;hpb=8f33ee4940b9c35bf4627b7ef1126d03748da646;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index a70ea3ac..b9fd88c6 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1911,6 +1911,7 @@ void LoadCustomMusic_NoConf(void) boolean music_already_used = FALSE; int i; + /* skip all music files that are configured in music config file */ for (i = 0; i < num_music; i++) { struct FileInfo *music = getMusicListEntry(i); @@ -1959,10 +1960,6 @@ void LoadCustomMusic_NoConf(void) closedir(dir); draw_init_text = FALSE; - - if (num_music_noconf == 0) - Error(ERR_WARN, "cannot find any valid music files in directory '%s'", - music_directory); } int getSoundListSize()