[Scummvm-cvs-logs] SF.net SVN: scummvm:[36221] scummvm/trunk/engines/kyra/text_mr.cpp

[lordhoto at users.sourceforge.net]

Revision: 36221
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36221&view=rev
Author:   lordhoto
Date:     2009-02-05 19:25:52 +0000 (Thu, 05 Feb 2009)

Log Message:
-----------
Allow ScummVM to quit while a character is talking in Kyra3.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/text_mr.cpp

Modified: scummvm/trunk/engines/kyra/text_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_mr.cpp	2009-02-04 22:05:57 UTC (rev 36220)
+++ scummvm/trunk/engines/kyra/text_mr.cpp	2009-02-05 19:25:52 UTC (rev 36221)
@@ -354,7 +354,7 @@
 			_emc->start(&_chatScriptState, 1);
 
 		_animNeedUpdate = false;
-		while (!_animNeedUpdate && _emc->isValid(&_chatScriptState)) {
+		while (!_animNeedUpdate && _emc->isValid(&_chatScriptState) && !shouldQuit()) {
 			musicUpdate(0);
 			_emc->run(&_chatScriptState);
 		}
@@ -861,7 +861,7 @@
 
 	uint32 endTime = _chatEndTime;
 	bool running = true;
-	while (running) {
+	while (running && !shouldQuit()) {
 		if (!_emc->run(&_dialogScriptState)) {
 			_emc->init(&_dialogScriptState, &_dialogScriptData);
 			_emc->start(&_dialogScriptState, _dialogScriptFuncProc);


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