[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.52,1.53

[James Brown]

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

Modified Files:
	script_v1.cpp 
Log Message:
Make Zak/Indy inventories work.



Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** script_v1.cpp	18 Mar 2002 14:09:01 -0000	1.52
--- script_v1.cpp	18 Mar 2002 14:45:57 -0000	1.53
***************
*** 2498,2513 ****
  
  void Scumm::o5_pickupObjectOld() {
  
! 	int obj;
! 
!         obj = getVarOrDirectWord(0x80);
! 
! 	if(getObjectIndex(obj) != 1)
  		return;
  	
! 	addObjectToInventory(obj,_currentRoom);	/*FIXME: the implementation is not quite acurate */
! 
! 	
! 	warning("pickupObjectOld(%d) not fully supported",obj);
! 
  }
--- 2498,2512 ----
  
  void Scumm::o5_pickupObjectOld() {
+ 	int obj = getVarOrDirectWord(0x80);
  
! 	if(getObjectIndex(obj) == -1)
  		return;
  	
! 	addObjectToInventory(obj,_currentRoom);
! 	removeObjectFromRoom(obj);
! 	putOwner(obj, _vars[VAR_EGO]);
! 	putClass(obj, 32, 1);
! 	putState(obj, 1);
! 	clearDrawObjectQueue();
! 	runHook(1);
  }