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

[peres001 at users.sourceforge.net]

Revision: 49103
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49103&view=rev
Author:   peres001
Date:     2010-05-19 16:54:42 +0000 (Wed, 19 May 2010)

Log Message:
-----------
Do not try and run dialogues when there is no dialogue defined in a SPEAK zone. Patch 3003382 by fuzzie.

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

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2010-05-19 15:57:58 UTC (rev 49102)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2010-05-19 16:54:42 UTC (rev 49103)
@@ -598,8 +598,11 @@
 		break;
 
 	case kZoneSpeak:
-		enterDialogueMode(z);
-		return;
+		if (z->u._speakDialogue) {
+			enterDialogueMode(z);
+			return;
+		}
+		break;
 	}
 
 	debugC(3, kDebugExec, "runZone completed");


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