libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 08:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply patch 3004991 by fuzzie: don't try and run dialogues for SPEAK zones without dialogue, but run the command list anyway.

Browse Source 
svn-id: r49140
This commit is contained in:
Nicola Mettifogo 2010-05-22 15:56:09 +00:00
parent 1b6d9c86e2
commit 866e15e8b2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/parallaction/exec_br.cpp
View File

@ -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;

4
engines/parallaction/parallaction_br.cpp
View File

@ -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