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

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Sat May 22 17:30:19 CEST 2010


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

Log Message:
-----------
Make sure a dialogue is valid before entering dialogue mode.

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

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2010-05-22 12:37:07 UTC (rev 49138)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2010-05-22 15:30:18 UTC (rev 49139)
@@ -461,6 +461,10 @@
 
 
 void Parallaction::enterDialogueMode(ZonePtr z) {
+	if (!z->u._speakDialogue) {
+		return;
+	}
+
 	debugC(1, kDebugDialogue, "Parallaction::enterDialogueMode(%s)", z->u._filename.c_str());
 	_dialogueMan = createDialogueManager(z);
 	assert(_dialogueMan);


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




More information about the Scummvm-git-logs mailing list