diff options
| author | Gregory Montoir | 2004-09-26 18:55:11 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-09-26 18:55:11 +0000 |
| commit | bbb4de2360c8db3b84dabf4c5941b305ba7a0cfc (patch) | |
| tree | 27f49717b896747ba1f8af640bf55a5d1bba3462 | |
| parent | bc5407c15462b0be2bec522805f792295053a01f (diff) | |
| download | scummvm-rg350-bbb4de2360c8db3b84dabf4c5941b305ba7a0cfc.tar.gz scummvm-rg350-bbb4de2360c8db3b84dabf4c5941b305ba7a0cfc.tar.bz2 scummvm-rg350-bbb4de2360c8db3b84dabf4c5941b305ba7a0cfc.zip | |
stop the current sfx from playing if a cutaway is cancelled
svn-id: r15302
| -rw-r--r-- | queen/cutaway.cpp | 3 | ||||
| -rw-r--r-- | queen/sound.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index 012ba4cc33..ae6bbc7e01 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -986,9 +986,10 @@ void Cutaway::run(char *nextFilename) { joeBob->animating = 0; joeBob->moving = 0; - // if the cutaway has been cancelled, we must stop the speech as well + // if the cutaway has been cancelled, we must stop the speech and the sfx as well if (_vm->sound()->speechOn()) _vm->sound()->stopSpeech(); + _vm->sound()->stopSfx(); _vm->input()->cutawayRunning(false); _vm->input()->cutawayQuitReset(); diff --git a/queen/sound.h b/queen/sound.h index 33c9398fb2..2526aff770 100644 --- a/queen/sound.h +++ b/queen/sound.h @@ -60,6 +60,7 @@ public: void playSong(int16 songNum); void playLastSong() { playSong(_lastOverride); } void stopSpeech() { _mixer->stopHandle(_speechHandle); } + void stopSfx() { _mixer->stopHandle(_sfxHandle); } bool sfxOn() const { return _sfxToggle; } void sfxToggle(bool val) { _sfxToggle = val; } |