aboutsummaryrefslogtreecommitdiff
path: root/queen/command.cpp
diff options
context:
space:
mode:
authorGregory Montoir2004-01-10 12:56:07 +0000
committerGregory Montoir2004-01-10 12:56:07 +0000
commit9439e09e45d9e14b9d5bc297a7c618ee3f948f9e (patch)
treec5abae4c86c6e173b2dd81ce50c6ceb37f2fd7bb /queen/command.cpp
parentc4528ac022d13fde66a4d494110da4e97d2660c0 (diff)
downloadscummvm-rg350-9439e09e45d9e14b9d5bc297a7c618ee3f948f9e.tar.gz
scummvm-rg350-9439e09e45d9e14b9d5bc297a7c618ee3f948f9e.tar.bz2
scummvm-rg350-9439e09e45d9e14b9d5bc297a7c618ee3f948f9e.zip
this should fix :
- minor sound glitch in room 50 (temple zombies) - panel undisplayed at the end of cutaway c62c - wrong dirty blocks in room 76 - Cutaway::_cutAnim is now a 21x30 elements array. This is needed for cutaway c69g, where we setup frames for bob num 20 (the original game uses the same value) - Credits::_list is now a 18 elements array (that's what credits2.crd need) svn-id: r12294
Diffstat (limited to 'queen/command.cpp')
-rw-r--r--queen/command.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/queen/command.cpp b/queen/command.cpp
index 76b27a0793..7e177a33ac 100644
--- a/queen/command.cpp
+++ b/queen/command.cpp
@@ -407,7 +407,9 @@ int16 Command::executeCommand(uint16 comId, int16 condResult) {
}
// don't play music on an OPEN/CLOSE command - in case the command fails
- if (_state.selAction != VERB_OPEN && _state.selAction != VERB_CLOSE) {
+ if (_state.selAction != VERB_NONE &&
+ _state.selAction != VERB_OPEN &&
+ _state.selAction != VERB_CLOSE) {
// only play song if it's a PLAY BEFORE type
if (com->song > 0) {
_vm->sound()->playSong(com->song);