diff options
| author | Christopher Page | 2008-07-21 22:46:39 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-07-21 22:46:39 +0000 |
| commit | 09f4fd946ee4b3fd6d9780e080b9bc95fbcd0a69 (patch) | |
| tree | e4aae52f4e6872f8cd6bed9ddab5de6d0521f7d2 /engines/parallaction/parallaction_br.cpp | |
| parent | 0cae5552db214a7e11c552205e03fd5c0c38f6fd (diff) | |
| parent | e09eb75ef77d6e76b763b3a47540a530013a887f (diff) | |
| download | scummvm-rg350-09f4fd946ee4b3fd6d9780e080b9bc95fbcd0a69.tar.gz scummvm-rg350-09f4fd946ee4b3fd6d9780e080b9bc95fbcd0a69.tar.bz2 scummvm-rg350-09f4fd946ee4b3fd6d9780e080b9bc95fbcd0a69.zip | |
Merged revisions 33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r33183
Diffstat (limited to 'engines/parallaction/parallaction_br.cpp')
| -rw-r--r-- | engines/parallaction/parallaction_br.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp index 090184e9fe..0c8058e4bd 100644 --- a/engines/parallaction/parallaction_br.cpp +++ b/engines/parallaction/parallaction_br.cpp @@ -212,13 +212,21 @@ void Parallaction_br::runPendingZones() { if (_activeZone) { z = _activeZone; // speak Zone or sound _activeZone = nullZonePtr; - runZone(z); // FIXME: BRA doesn't handle sound yet + if ((z->_type & 0xFFFF) == kZoneSpeak) { + enterDialogueMode(z); + } else { + runZone(z); // FIXME: BRA doesn't handle sound yet + } } if (_activeZone2) { z = _activeZone2; // speak Zone or sound _activeZone2 = nullZonePtr; - runZone(z); + if ((z->_type & 0xFFFF) == kZoneSpeak) { + enterDialogueMode(z); + } else { + runZone(z); // FIXME: BRA doesn't handle sound yet + } } } |