[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.144,1.145 script_v2.cpp,2.208,2.209

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2531/scumm

Modified Files:
	object.cpp script_v2.cpp 
Log Message:

Hopefully right this time, last change caused a cheat (Free air travel)


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- object.cpp	3 Oct 2003 18:33:54 -0000	1.144
+++ object.cpp	29 Oct 2003 10:24:03 -0000	1.145
@@ -143,6 +143,13 @@
 
 	if (_gameId == GID_MANIAC && (obj == 182 || obj == 193))
 		_objectStateTable[obj] |= 0x08;
+
+	// The Enchanced version of Zak McKracken included in the
+	// SelectWare Classic Collection bundle has no copy protection 
+	// and doesn't include the codes.
+
+	if (_gameId == GID_ZAK && obj == 213)
+		_objectStateTable[obj] |= 0x08;
 #endif
 
 	return _objectStateTable[obj];

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.208
retrieving revision 2.209
diff -u -d -r2.208 -r2.209
--- script_v2.cpp	29 Oct 2003 06:36:06 -0000	2.208
+++ script_v2.cpp	29 Oct 2003 10:24:03 -0000	2.209
@@ -428,25 +428,12 @@
 	actorTalk();
 }
 
-#ifndef BYPASS_COPY_PROT
-#define BYPASS_COPY_PROT
-#endif
-
 int ScummEngine_v2::readVar(uint var) {
 	if (var >= 14 && var <= 16)
 		var = _scummVars[var];
 
 	checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)");
 	debug(6, "readvar(%d) = %d", var, _scummVars[var]);
-
-#if defined(BYPASS_COPY_PROT)
-	// The Enchanced version of Zak McKracken included in the
-	// SelectWare Classic Collection bundle has no copy protection 
-	// and doesn't include the codes.
-	if (_gameId == GID_ZAK && var == 244)
-		return 0;
-#endif
-
 	return _scummVars[var];
 }