aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/exec_br.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2010-05-22 15:56:09 +0000
committerNicola Mettifogo2010-05-22 15:56:09 +0000
commit866e15e8b2b11ae72f3fcb803b57dd770adc6b57 (patch)
treea1d90e12f98faccdb69d3e5bf146f29743216f3f /engines/parallaction/exec_br.cpp
parent1b6d9c86e2b62f4e1543417d43386fab12c7f4f0 (diff)
downloadscummvm-rg350-866e15e8b2b11ae72f3fcb803b57dd770adc6b57.tar.gz
scummvm-rg350-866e15e8b2b11ae72f3fcb803b57dd770adc6b57.tar.bz2
scummvm-rg350-866e15e8b2b11ae72f3fcb803b57dd770adc6b57.zip
Apply patch 3004991 by fuzzie: don't try and run dialogues for SPEAK zones without dialogue, but run the command list anyway.
svn-id: r49140
Diffstat (limited to 'engines/parallaction/exec_br.cpp')
-rw-r--r--engines/parallaction/exec_br.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp
index d5d89616d2..e145c0da94 100644
--- a/engines/parallaction/exec_br.cpp
+++ b/engines/parallaction/exec_br.cpp
@@ -337,7 +337,7 @@ DECLARE_COMMAND_OPCODE(speak) {
return;
}
- if (ACTIONTYPE(ctxt._cmd->_zone) == kZoneSpeak) {
+ if (ACTIONTYPE(ctxt._cmd->_zone) == kZoneSpeak && ctxt._cmd->_zone->u._speakDialogue) {
_vm->enterDialogueMode(ctxt._cmd->_zone);
} else {
_vm->_activeZone = ctxt._cmd->_zone;