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

[peres001 at users.sourceforge.net]

Revision: 33191
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33191&view=rev
Author:   peres001
Date:     2008-07-22 10:12:20 +0000 (Tue, 22 Jul 2008)

Log Message:
-----------
Fixed regression in dialogue code: certain commands weren't executed anymore after dialogue ended.

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

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2008-07-22 09:23:37 UTC (rev 33190)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2008-07-22 10:12:20 UTC (rev 33191)
@@ -359,9 +359,6 @@
 		break;
 
 	case DIALOGUE_OVER:
-		if (_cmdList) {
-			_vm->_cmdExec->run(*_cmdList);
-		}
 		break;
 
 	default:
@@ -381,6 +378,10 @@
 	debugC(1, kDebugDialogue, "Parallaction::exitDialogueMode()");
 	_input->_inputMode = Input::kInputModeGame;
 
+	if (_dialogueMan->_cmdList) {
+		_vm->_cmdExec->runList(*_dialogueMan->_cmdList);
+	}
+
 	// The current instance of _dialogueMan must be destroyed before the zone commands
 	// are executed, because they may create another instance of _dialogueMan that
 	// overwrite the current one. This would cause headaches (and it did, actually).


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