projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020424-1-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 69008db67a887ed0e384734734f3c99ca2f9c24f..eee87022ee3146e7e37a903467f5a88f41fec398 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-157,21
+157,12
@@
void InitSound()
OpenAudio();
OpenAudio();
- for(i=0; i<NUM_SOUNDS; i++)
- {
- if (!LoadCustomSound(sound_name[i]))
- {
- Error(ERR_WARN, "sounds deactivated");
-
- audio.sound_available = FALSE;
- audio.loops_available = FALSE;
- audio.sound_enabled = FALSE;
+ InitSoundList(NUM_SOUNDS);
- return;
- }
- }
+ for(i=0; i<NUM_SOUNDS; i++)
+ LoadSoundToList(sound_name[i], i);
-
num_bg_loops = Load
Music();
+
LoadCustom
Music();
StartSoundserver();
}
StartSoundserver();
}
@@
-1602,8
+1593,9
@@
void CloseAllAndExit(int exit_value)
int i;
StopSounds();
int i;
StopSounds();
- FreeSounds(NUM_SOUNDS);
CloseAudio();
CloseAudio();
+ FreeAllSounds();
+ FreeAllMusic();
FreeTileClipmasks();
for(i=0; i<NUM_BITMAPS; i++)
FreeTileClipmasks();
for(i=0; i<NUM_BITMAPS; i++)