1 files changed, 9 insertions, 6 deletions

diff --git a/noncore/games/sfcave-sdl/sound.cpp b/noncore/games/sfcave-sdl/sound.cpp
index 5fda859..855f2e6 100644
--- a/noncore/games/sfcave-sdl/sound.cpp
+++ b/noncore/games/sfcave-sdl/sound.cpp
@@ -32,4 +32,5 @@ bool SoundHandler :: init( )
 

 	soundOn = true;

+	musicOn = true;

 

 	return true;

@@ -39,6 +40,8 @@ void SoundHandler :: cleanUp()
 {

 	// Free audio sounds

-	Mix_FreeChunk( sounds[SND_EXPLOSION] );

-	Mix_FreeChunk( sounds[SND_THRUST] );

+	if ( sounds[SND_EXPLOSION] )

+    	Mix_FreeChunk( sounds[SND_EXPLOSION] );

+	if ( sounds[SND_THRUST] )

+    	Mix_FreeChunk( sounds[SND_THRUST] );

 

 	if ( music )

@@ -53,5 +56,5 @@ int SoundHandler :: playSound( int soundNr, int channel, int nrLoops, int playBe
 		return -1;

 

-	if ( soundNr >= NR_SOUNDS )

+	if ( soundNr >= NR_SOUNDS || !sounds[soundNr] )

 		return -1;

 

@@ -102,5 +105,5 @@ void SoundHandler :: playMusic( string musicFile )
 void SoundHandler :: playMusic( bool fade )

 {

-	if ( !soundOn )

+	if ( !musicOn )

 		return;

 

@@ -109,5 +112,5 @@ void SoundHandler :: playMusic( bool fade )
 		Mix_VolumeMusic( MIX_MAX_VOLUME );

 		Mix_RewindMusic();

-		

+

 		if ( fade )

     		Mix_FadeInMusic( music, -1, 1000 );

@@ -147,5 +150,5 @@ void SoundHandler :: setMusicOn( bool val )
 {

 	musicOn = val;

-	

+

 	if ( !musicOn )

 	   stopMusic();