aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorGregory Montoir2004-10-03 20:27:39 +0000
committerGregory Montoir2004-10-03 20:27:39 +0000
commitfbe5b94137bb73ad238df6d24ca48237ed493047 (patch)
tree3d82a114ed78bcc34912dede0544a577fa05a0bf /queen
parentf94cc6b19893243c3ef0030d3f7647139824204b (diff)
downloadscummvm-rg350-fbe5b94137bb73ad238df6d24ca48237ed493047.tar.gz
scummvm-rg350-fbe5b94137bb73ad238df6d24ca48237ed493047.tar.bz2
scummvm-rg350-fbe5b94137bb73ad238df6d24ca48237ed493047.zip
as pointed out by salty-horse, it's better to stop speech and sfx only when the cutaway is cancelled
svn-id: r15397
Diffstat (limited to 'queen')
-rw-r--r--queen/cutaway.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp
index ae6bbc7e01..fffc781f61 100644
--- a/queen/cutaway.cpp
+++ b/queen/cutaway.cpp
@@ -917,8 +917,6 @@ void Cutaway::run(char *nextFilename) {
stop();
- _vm->input()->cutawayQuitReset();
-
updateGameState();
_vm->bankMan()->close(CUTAWAY_BANK);
@@ -987,9 +985,11 @@ void Cutaway::run(char *nextFilename) {
joeBob->moving = 0;
// 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();
+ if (_vm->input()->cutawayQuit()) {
+ if (_vm->sound()->speechOn())
+ _vm->sound()->stopSpeech();
+ _vm->sound()->stopSfx();
+ }
_vm->input()->cutawayRunning(false);
_vm->input()->cutawayQuitReset();