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
@@ -28,34 +28,37 @@ bool SoundHandler :: init( )
         sounds[SND_EXPLOSION] = Mix_LoadWAV( SOUND_PATH "explosion.wav");

         sounds[SND_THRUST] = Mix_LoadWAV( SOUND_PATH "thrust.wav");

 

         music = 0;

 

         soundOn = true;

+        musicOn = true;

 

         return true;

 }

 

 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 )

                 Mix_FreeMusic( music );

 

         Mix_CloseAudio();

 }

 

 int SoundHandler :: playSound( int soundNr, int channel, int nrLoops, int playBeforeFinished )

 {

         if ( !soundOn )

                 return -1;

 

-        if ( soundNr >= NR_SOUNDS )

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

                 return -1;

 

         Mix_Chunk *chunk = sounds[soundNr];

     if( channel == -1 || !Mix_Playing( channel ) )

                 channel = Mix_PlayChannel(-1, sounds[soundNr], nrLoops);

 

@@ -98,20 +101,20 @@ void SoundHandler :: playMusic( string musicFile )
 

         playMusic();

 }

 

 void SoundHandler :: playMusic( bool fade )

 {

-        if ( !soundOn )

+        if ( !musicOn )

                 return;

 

         if ( music )

         {

                 Mix_VolumeMusic( MIX_MAX_VOLUME );

                 Mix_RewindMusic();

-                

+

                 if ( fade )

                 Mix_FadeInMusic( music, -1, 1000 );

         else

                 Mix_PlayMusic( music, -1 );

 

         }

@@ -143,12 +146,12 @@ void SoundHandler :: setSoundsOn( bool val )
         soundOn = val;

 }

 

 void SoundHandler :: setMusicOn( bool val )

 {

         musicOn = val;

-        

+

         if ( !musicOn )

            stopMusic();

     else

         playMusic( true );

 }