[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.174,1.175 script_v5.cpp,1.252,1.253

[Travis Howell]

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

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

Enable original method of skipping copy protection


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- script.cpp	18 Aug 2004 10:41:39 -0000	1.174
+++ script.cpp	20 Aug 2004 01:26:56 -0000	1.175
@@ -497,9 +497,6 @@
 			if (var == 490 && _gameId == GID_MONKEY2 && !copyprotbypassed) {
 				copyprotbypassed = true;
 				var = 518;
-			} else if (var == 179 && (_gameId == GID_MONKEY_VGA || _gameId == GID_MONKEY_EGA) && !copyprotbypassed) {
-				copyprotbypassed = true;
-				var = 266;
 			}
 		}
 
@@ -526,10 +523,7 @@
 				// during the game...
 				if (_gameId == GID_INDY3 && (_features & GF_OLD_BUNDLE) && var == 94 && bit == 4) {
 					return 0;
-				} 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
+				} else if (_gameId == GID_LOOM && (_features & GF_FMTOWNS) && var == 214 && bit == 15) {
 					return 0;
 				} else if (_gameId == GID_ZAK256 && var == 151 && bit == 8) {
 					return 0;

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- script_v5.cpp	14 Aug 2004 19:41:59 -0000	1.252
+++ script_v5.cpp	20 Aug 2004 01:26:56 -0000	1.253
@@ -2203,7 +2203,6 @@
 
 	getWordVararg(data);
 
-/*
 	if (!_copyProtection) {
 		// Method used by original games to skip copy protection scheme
 		if (_gameId == GID_LOOM && _currentRoom == 69 && script == 201)
@@ -2211,7 +2210,6 @@
 		else if ((_gameId == GID_MONKEY_VGA || _gameId == GID_MONKEY_EGA) && script == 152)
 			return;
 	}
-*/
 
 	runScript(script, (op & 0x20) != 0, (op & 0x40) != 0, data);
 }