[Scummvm-cvs-logs] SF.net SVN: scummvm: [23154] scummvm/branches/branch-0-9-0/engines/scumm/script.cpp
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sat Jun 17 07:51:59 CEST 2006
Revision: 23154
Author: kirben
Date: 2006-06-16 22:51:54 -0700 (Fri, 16 Jun 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23154&view=rev
Log Message:
-----------
Limit vm.numNestedScripts to positive value, when subtracting slot in runScriptNested(). Fixes restart, after ending sequence in freddi4
Modified Paths:
--------------
scummvm/branches/branch-0-9-0/engines/scumm/script.cpp
Modified: scummvm/branches/branch-0-9-0/engines/scumm/script.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/scumm/script.cpp 2006-06-17 05:48:43 UTC (rev 23153)
+++ scummvm/branches/branch-0-9-0/engines/scumm/script.cpp 2006-06-17 05:51:54 UTC (rev 23154)
@@ -336,7 +336,8 @@
getScriptEntryPoint();
executeScript();
- vm.numNestedScripts--;
+ if (vm.numNestedScripts != 0)
+ vm.numNestedScripts--;
if (nest->number != 0xFF) {
// Try to resume the script which called us, if its status has not changed
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