[Scummvm-cvs-logs] SF.net SVN: scummvm:[49140] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 49140
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49140&view=rev
Author:   peres001
Date:     2010-05-22 15:56:09 +0000 (Sat, 22 May 2010)

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

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/exec_br.cpp
    scummvm/trunk/engines/parallaction/parallaction_br.cpp

Modified: scummvm/trunk/engines/parallaction/exec_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_br.cpp	2010-05-22 15:30:18 UTC (rev 49139)
+++ scummvm/trunk/engines/parallaction/exec_br.cpp	2010-05-22 15:56:09 UTC (rev 49140)
@@ -337,7 +337,7 @@
 		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;

Modified: scummvm/trunk/engines/parallaction/parallaction_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_br.cpp	2010-05-22 15:30:18 UTC (rev 49139)
+++ scummvm/trunk/engines/parallaction/parallaction_br.cpp	2010-05-22 15:56:09 UTC (rev 49140)
@@ -195,7 +195,7 @@
 	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 @@
 	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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.