projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20031215-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
sound.c
diff --git
a/src/libgame/sound.c
b/src/libgame/sound.c
index a70ea3accf9018ed7c264f76b6bc06f61a89f5b6..b9fd88c66a460dd72e58300cba60644236440794 100644
(file)
--- 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;
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);
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;
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()
}
int getSoundListSize()