[Scummvm-cvs-logs] scummvm master -> 07c054d6c63bec5a9abd1b77781958f4a83969bc

digitall digitall at scummvm.org
Tue Feb 22 08:20:57 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
07c054d6c6 CRUISE: Reinstate Copy Protection errorneously disabled in r51834.


Commit: 07c054d6c63bec5a9abd1b77781958f4a83969bc
    https://github.com/scummvm/scummvm/commit/07c054d6c63bec5a9abd1b77781958f4a83969bc
Author: D G Turner (digitall at scummvm.org)
Date: 2011-02-21T23:17:22-08:00

Commit Message:
CRUISE: Reinstate Copy Protection errorneously disabled in r51834.

r51834 (f4d38ccd407f2a007050d69e4841ba7fc53cd401) was a commit to add
English Floppy version of LoL to Kyra, but a file was accidently
committed to Cruise as a sideffect.

Changed paths:
    engines/cruise/script.cpp



diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp
index 317dcfb..aae4dba 100644
--- a/engines/cruise/script.cpp
+++ b/engines/cruise/script.cpp
@@ -619,13 +619,13 @@ int executeScripts(scriptInstanceStruct *ptr) {
 	positionInStack = 0;
 
 	do {
-//#ifdef SKIP_INTRO
+#ifdef SKIP_INTRO
 		if (currentScriptPtr->scriptOffset == 290
 		        && currentScriptPtr->overlayNumber == 4
 		        && currentScriptPtr->scriptNumber == 0) {
 			currentScriptPtr->scriptOffset = 923;
 		}
-//#endif
+#endif
 		opcodeType = getByteFromScript();
 
 		debugC(5, kCruiseDebugScript, "Script %s/%d ip=%d opcode=%d",






More information about the Scummvm-git-logs mailing list