[Scummvm-cvs-logs] SF.net SVN: scummvm: [21307] scummvm/trunk/engines/scumm/script.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Tue Mar 14 22:30:02 CET 2006


Revision: 21307
Author:   kirben
Date:     2006-03-14 22:29:28 -0800 (Tue, 14 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21307&view=rev

Log Message:
-----------
Correct VAR_OVERRIDE settings in override opcodes

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp
Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2006-03-15 05:59:30 UTC (rev 21306)
+++ scummvm/trunk/engines/scumm/script.cpp	2006-03-15 06:29:28 UTC (rev 21307)
@@ -1365,8 +1365,8 @@
 	fetchScriptByte();
 	fetchScriptWord();
 
-	// This is based on disassembly
-	VAR(VAR_OVERRIDE) = 0;
+	if (_game.version >= 5)
+		VAR(VAR_OVERRIDE) = 0;
 }
 
 void ScummEngine::endOverride() {
@@ -1376,7 +1376,7 @@
 	vm.cutScenePtr[idx] = 0;
 	vm.cutSceneScript[idx] = 0;
 
-	if (_game.version > 3)
+	if (_game.version >= 4)
 		VAR(VAR_OVERRIDE) = 0;
 }
 


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