diff options
| author | Nicola Mettifogo | 2010-05-22 15:56:09 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2010-05-22 15:56:09 +0000 |
| commit | 866e15e8b2b11ae72f3fcb803b57dd770adc6b57 (patch) | |
| tree | a1d90e12f98faccdb69d3e5bf146f29743216f3f | |
| parent | 1b6d9c86e2b62f4e1543417d43386fab12c7f4f0 (diff) | |
| download | scummvm-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
| -rw-r--r-- | engines/parallaction/exec_br.cpp | 2 | ||||
| -rw-r--r-- | engines/parallaction/parallaction_br.cpp | 4 |
2 files changed, 3 insertions, 3 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; diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp index 9fd46cc9af..c752c85d4f 100644 --- a/engines/parallaction/parallaction_br.cpp +++ b/engines/parallaction/parallaction_br.cpp @@ -195,7 +195,7 @@ void Parallaction_br::runPendingZones() { if (_activeZone) { z = _activeZone; // speak Zone or sound _activeZone.reset(); - if (ACTIONTYPE(z) == kZoneSpeak) { + if (ACTIONTYPE(z) == kZoneSpeak && z->u._speakDialogue) { enterDialogueMode(z); } else { runZone(z); // FIXME: BRA doesn't handle sound yet @@ -205,7 +205,7 @@ void Parallaction_br::runPendingZones() { if (_activeZone2) { z = _activeZone2; // speak Zone or sound _activeZone2.reset(); - if (ACTIONTYPE(z) == kZoneSpeak) { + if (ACTIONTYPE(z) == kZoneSpeak && z->u._speakDialogue) { enterDialogueMode(z); } else { runZone(z); // FIXME: BRA doesn't handle sound yet |