[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.102,1.103

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv26056

Modified Files:
	script_v1.cpp 
Log Message:
Check gameID for Zak TV fix



Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- script_v1.cpp	8 May 2002 10:33:30 -0000	1.102
+++ script_v1.cpp	10 May 2002 16:14:52 -0000	1.103
@@ -1391,13 +1391,15 @@
 	o2 = getVarOrDirectWord(0x40);
 	r = getObjActToObjActDist(o1, o2);
 
-	/* Fix for monkey 2, dunno what's wrong in scummvm */
+	/* FIXME: Fix for monkey 2, dunno what's wrong in scummvm */
 	if (_gameId == GID_MONKEY2 && vm.slot[_currentScript].number == 40
 			&& r < 60)
 		r = 60;
 
-	if (r > 0)	// FIXME: Fixes several off-by-one errors (eg,					
-		r--;	//		  zak's tv). Find real cause of bug. 
+	/* FIXME: Patch to allow TV cord to be picked up in Zak256 */
+	if ((_gameId == GID_ZAK256) && (r > 0))
+		r--;	
+
 	setResult(r);
 }