[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.161,1.162 script_v5.cpp,1.244,1.245

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11718/scumm

Modified Files:
	script.cpp script_v5.cpp 
Log Message:

Ooops commited wrong branch.


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- script.cpp	24 Jul 2004 07:13:17 -0000	1.161
+++ script.cpp	24 Jul 2004 07:18:18 -0000	1.162
@@ -460,8 +460,7 @@
 	else
 		copyprotbypassed = true;
 
-	if (var == VAR_TIMER)
-		debug(1, "readvar(%d)", var);
+	debugC(DEBUG_VARS, "readvar(%d)", var);
 
 	if (var & 0x2000 && !(_features & GF_NEW_OPCODES)) {
 		a = fetchScriptWord();
@@ -504,10 +503,16 @@
 			if (!_copyProtection) {
 				// INDY3, EGA Loom and, apparently, Zak256 check this
 				// during the game...
-				if (_gameId == GID_INDY3 && (_features & GF_OLD_BUNDLE) && var == 94 && bit == 4)
+				if (_gameId == GID_INDY3 && (_features & GF_OLD_BUNDLE) && var == 94 && bit == 4) {
 					return 0;
-				else if (_gameId == GID_ZAK256 && var == 151 && bit == 8)
+				} else if (var == 221 && bit == 14 && _gameId == GID_LOOM && (_features & GF_MACINTOSH)) {	// For Mac Loom
+					return 0;
+				// For all other Loom versions? PC and FM Towns at least in any event
+				} else if (_gameId == GID_LOOM && var == 214 && bit == 15) {	// For PC Loom
+					return 0;
+				} else if (_gameId == GID_ZAK256 && var == 151 && bit == 8) {
 					return 0;
+				}
 			}
 
 			checkRange(_numVariables - 1, 0, var, "Variable %d out of range(rzb)");
@@ -540,8 +545,7 @@
 }
 
 void ScummEngine::writeVar(uint var, int value) {
-	if (var == VAR_TIMER)
-		debug(1, "writeVar(%d, %d)", var, value);
+	debugC(DEBUG_VARS, "writeVar(%d, %d)", var, value);
 
 	if (!(var & 0xF000)) {
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- script_v5.cpp	24 Jul 2004 07:13:26 -0000	1.244
+++ script_v5.cpp	24 Jul 2004 07:18:18 -0000	1.245
@@ -2200,6 +2200,7 @@
 
 	getWordVararg(data);
 
+/*
 	if (!_copyProtection) {
 		// Method used by original games to skip copy protection scheme
 		if (_gameId == GID_LOOM && _currentRoom == 69 && script == 201)
@@ -2207,6 +2208,7 @@
 		else if ((_gameId == GID_MONKEY_VGA || _gameId == GID_MONKEY_EGA) && script == 152)
 			return;
 	}
+*/
 
 	runScript(script, (op & 0x20) != 0, (op & 0x40) != 0, data);
 }