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

sylvaintv at users.sourceforge.net sylvaintv at users.sourceforge.net
Sun Oct 10 16:30:15 CEST 2010


Revision: 53119
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53119&view=rev
Author:   sylvaintv
Date:     2010-10-10 14:30:13 +0000 (Sun, 10 Oct 2010)

Log Message:
-----------
TOON: Disable too many levels of recursion with click events

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

Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp	2010-10-10 14:27:19 UTC (rev 53118)
+++ scummvm/trunk/engines/toon/toon.cpp	2010-10-10 14:30:13 UTC (rev 53119)
@@ -1121,7 +1121,8 @@
 
 int32 ToonEngine::runEventScript(int32 x, int32 y, int32 mode, int32 id, int32 scriptId) {
 
-	assert(_currentScriptRegion < 4);
+	if (_currentScriptRegion >= 4)
+		return 0;
 
 	EMCState *status = &_scriptState[_currentScriptRegion];
 	_script->init(status, &_scriptData);
@@ -1228,6 +1229,7 @@
 		commandId = 2 * (_gameState->_mouseState - 1) + 16;
 	}
 
+	_drew->stopWalk();
 
 	int16 command = currentHot->getData(commandId);
 	int16 argument = currentHot->getData(commandId + 1);


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