projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved requesting game restart to function that checks for game over
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 39f145f539e1752a05c7a0a7e40e93fd11947055..5d191f027233d559a855fb16b5d50b00a2d19e25 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-12952,7
+12952,7
@@
void LoadMusicInfo(void)
int num_music = getMusicListSize();
int num_music_noconf = 0;
int num_sounds = getSoundListSize();
int num_music = getMusicListSize();
int num_music_noconf = 0;
int num_sounds = getSoundListSize();
- Directory *dir;
+ Directory *dir
= NULL
;
DirectoryEntry *dir_entry;
struct FileInfo *music, *sound;
struct MusicFileInfo *next, **new;
DirectoryEntry *dir_entry;
struct FileInfo *music, *sound;
struct MusicFileInfo *next, **new;
@@
-13007,9
+13007,16
@@
void LoadMusicInfo(void)
// if all levels have game music configured, do not read music from directory
if (!checkLevelSetHasMusic_NoConf())
// if all levels have game music configured, do not read music from directory
if (!checkLevelSetHasMusic_NoConf())
+ {
read_music_from_directory = FALSE;
read_music_from_directory = FALSE;
+ }
+ else if (music_directory == NULL)
+ {
+ Warn("cannot find music directory with unconfigured music");
- if ((dir = openDirectory(music_directory)) == NULL)
+ read_music_from_directory = FALSE;
+ }
+ else if ((dir = openDirectory(music_directory)) == NULL)
{
Warn("cannot read music directory '%s'", music_directory);
{
Warn("cannot read music directory '%s'", music_directory);