mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-22 04:01:23 +00:00
stop the current sfx from playing if a cutaway is cancelled
svn-id: r15302
This commit is contained in:
parent
bc5407c154
commit
bbb4de2360
@ -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();
|
||||
|
@ -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; }
|
||||
|
Loading…
x
Reference in New Issue
Block a user