| 1 | From 88b8c4503a361b737079195dd87017ee583827f1 Mon Sep 17 00:00:00 2001
|
|---|
| 2 | From: Alyssa Milburn <fuzzie@fuzzie.org>
|
|---|
| 3 | Date: Thu, 20 May 2010 20:22:29 +0200
|
|---|
| 4 | Subject: [PATCH] add some more checks for dialogue in speak zones
|
|---|
| 5 |
|
|---|
| 6 | ---
|
|---|
| 7 | engines/parallaction/exec_br.cpp | 2 +-
|
|---|
| 8 | engines/parallaction/parallaction_br.cpp | 4 ++--
|
|---|
| 9 | 2 files changed, 3 insertions(+), 3 deletions(-)
|
|---|
| 10 |
|
|---|
| 11 | diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp
|
|---|
| 12 | index d5d8961..e145c0d 100644
|
|---|
| 13 | --- a/engines/parallaction/exec_br.cpp
|
|---|
| 14 | +++ b/engines/parallaction/exec_br.cpp
|
|---|
| 15 | @@ -337,7 +337,7 @@ DECLARE_COMMAND_OPCODE(speak) {
|
|---|
| 16 | return;
|
|---|
| 17 | }
|
|---|
| 18 |
|
|---|
| 19 | - if (ACTIONTYPE(ctxt._cmd->_zone) == kZoneSpeak) {
|
|---|
| 20 | + if (ACTIONTYPE(ctxt._cmd->_zone) == kZoneSpeak && ctxt._cmd->_zone->u._speakDialogue) {
|
|---|
| 21 | _vm->enterDialogueMode(ctxt._cmd->_zone);
|
|---|
| 22 | } else {
|
|---|
| 23 | _vm->_activeZone = ctxt._cmd->_zone;
|
|---|
| 24 | diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
|
|---|
| 25 | index 9fd46cc..c752c85 100644
|
|---|
| 26 | --- a/engines/parallaction/parallaction_br.cpp
|
|---|
| 27 | +++ b/engines/parallaction/parallaction_br.cpp
|
|---|
| 28 | @@ -195,7 +195,7 @@ void Parallaction_br::runPendingZones() {
|
|---|
| 29 | if (_activeZone) {
|
|---|
| 30 | z = _activeZone; // speak Zone or sound
|
|---|
| 31 | _activeZone.reset();
|
|---|
| 32 | - if (ACTIONTYPE(z) == kZoneSpeak) {
|
|---|
| 33 | + if (ACTIONTYPE(z) == kZoneSpeak && z->u._speakDialogue) {
|
|---|
| 34 | enterDialogueMode(z);
|
|---|
| 35 | } else {
|
|---|
| 36 | runZone(z); // FIXME: BRA doesn't handle sound yet
|
|---|
| 37 | @@ -205,7 +205,7 @@ void Parallaction_br::runPendingZones() {
|
|---|
| 38 | if (_activeZone2) {
|
|---|
| 39 | z = _activeZone2; // speak Zone or sound
|
|---|
| 40 | _activeZone2.reset();
|
|---|
| 41 | - if (ACTIONTYPE(z) == kZoneSpeak) {
|
|---|
| 42 | + if (ACTIONTYPE(z) == kZoneSpeak && z->u._speakDialogue) {
|
|---|
| 43 | enterDialogueMode(z);
|
|---|
| 44 | } else {
|
|---|
| 45 | runZone(z); // FIXME: BRA doesn't handle sound yet
|
|---|
| 46 | --
|
|---|
| 47 | 1.6.3.3
|
|---|
| 48 |
|
|---|
