[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.46,1.47

[James Brown]

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

Modified Files:
	script_v1.cpp 
Log Message:
Hack around an odd FOA bug. Maybe walkbox related.



Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** script_v1.cpp	13 Mar 2002 04:57:32 -0000	1.46
--- script_v1.cpp	13 Mar 2002 06:07:19 -0000	1.47
***************
*** 1276,1283 ****
  	o2 = getVarOrDirectWord(0x40);
  	r = getObjActToObjActDist(o1,o2);
! 	
  	/* Fix for monkey 2, dunno what's wrong in scummvm */
  	if (_gameId==GID_MONKEY2 && vm.slot[_currentScript].number==40 && r<60)
! 		r=60;
  	setResult(r);
  }
--- 1276,1287 ----
  	o2 = getVarOrDirectWord(0x40);
  	r = getObjActToObjActDist(o1,o2);
! 
! 	if ((_gameId==GID_INDY4) && (o2 == 1212))	/* Fix for FOA, another odd bug */
! 		r =  r - 20;
! 
  	/* Fix for monkey 2, dunno what's wrong in scummvm */
  	if (_gameId==GID_MONKEY2 && vm.slot[_currentScript].number==40 && r<60)
! 		r=60;	
! 
  	setResult(r);
  }