[Scummvm-cvs-logs] CVS: scummvm object.cpp,1.27,1.28 scumm.h,1.55,1.56

[James Brown]

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

Modified Files:
	object.cpp scumm.h 
Log Message:
Sam and Max inventory hack. Makes it work, but is nasty ;)



Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** object.cpp	24 Feb 2002 17:25:02 -0000	1.27
--- object.cpp	5 Mar 2002 09:24:42 -0000	1.28
***************
*** 822,825 ****
--- 822,841 ----
  }
  
+ void Scumm::SamInventoryHack(int obj) {	// FIXME: Sam and Max hack
+ 	int base = 6;
+ 
+ 	while (base < 80) {
+ 		int value = readArray(178, 0, base);
+ 		if (value == obj) return;
+ 		if (value == 0) {
+ 				_vars[179]++;
+ 				printf("Adding item %d to slot %d\n", obj, base);
+ 				writeArray(178, 0, base, obj);
+ 				return;
+ 		}
+ 		base++;
+ 	}
+ }
+ 
  void Scumm::setOwnerOf(int obj, int owner) {
  	ScriptSlot *ss;
***************
*** 834,837 ****
--- 850,856 ----
  		}
  	}
+ 	if ((owner == 2) && (_gameId == GID_SAMNMAX))
+ 		SamInventoryHack(obj);
+ 
  	putOwner(obj, owner);
  	runHook(0);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** scumm.h	2 Mar 2002 12:54:32 -0000	1.55
--- scumm.h	5 Mar 2002 09:24:42 -0000	1.56
***************
*** 1195,1198 ****
--- 1195,1199 ----
  	void putOwner(int obj, int owner);
  	int getObjectRoom(int obj);
+ 	void SamInventoryHack(int obj);	// FIXME: Sam and Max hack
  
  	void main();