[Scummvm-cvs-logs] SF.net SVN: scummvm:[38399] scummvm/branches/branch-0-13-0/engines/scumm/ script.cpp

[Kirben at users.sourceforge.net]

Revision: 38399
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38399&view=rev
Author:   Kirben
Date:     2009-02-17 09:42:23 +0000 (Tue, 17 Feb 2009)

Log Message:
-----------
Clear cutsceneOverride for all scripts (except current), when restarting any game, fixes bugs:
#1923193 - MONKEY: cannot restart during the intro
#2518226 - FT demo: debugger at end of demo

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/scumm/script.cpp

Modified: scummvm/branches/branch-0-13-0/engines/scumm/script.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/scumm/script.cpp	2009-02-17 09:41:21 UTC (rev 38398)
+++ scummvm/branches/branch-0-13-0/engines/scumm/script.cpp	2009-02-17 09:42:23 UTC (rev 38399)
@@ -1047,8 +1047,7 @@
 	for (int i = 0; i < NUM_SCRIPT_SLOT; i++) {
 		if (i != _currentScript) {
 			vm.slot[i].status = ssDead;
-			if (_game.version == 6)
-				vm.slot[i].cutsceneOverride = 0;
+			vm.slot[i].cutsceneOverride = 0;
 		}
 	}
 }


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