summaryrefslogtreecommitdiff
path: root/noncore/games/sfcave-sdl/sound.cpp
Side-by-side diff
Diffstat (limited to 'noncore/games/sfcave-sdl/sound.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/sfcave-sdl/sound.cpp15
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
@@ -33,2 +33,3 @@ bool SoundHandler :: init( )
soundOn = true;
+ musicOn = true;
@@ -40,4 +41,6 @@ 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] );
@@ -54,3 +57,3 @@ int SoundHandler :: playSound( int soundNr, int channel, int nrLoops, int playBe
- if ( soundNr >= NR_SOUNDS )
+ if ( soundNr >= NR_SOUNDS || !sounds[soundNr] )
return -1;
@@ -103,3 +106,3 @@ void SoundHandler :: playMusic( bool fade )
{
- if ( !soundOn )
+ if ( !musicOn )
return;
@@ -110,3 +113,3 @@ void SoundHandler :: playMusic( bool fade )
Mix_RewindMusic();
-
+
if ( fade )
@@ -148,3 +151,3 @@ void SoundHandler :: setMusicOn( bool val )
musicOn = val;
-
+
if ( !musicOn )