Sam and Max inventory hack. Makes it work, but is nasty ;)

svn-id: r3644

2 files changed, 20 insertions, 0 deletions

diff --git a/object.cpp b/object.cpp
index cc819a8d58..78ad2378a2 100644
--- a/object.cpp
+++ b/object.cpp
@@ -821,6 +821,22 @@ int Scumm::getInventorySlot() {
 	error("Inventory full, %d max items", _maxInventoryItems);
 }
 
+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;
 	if (owner==0) {
@@ -833,6 +849,9 @@ void Scumm::setOwnerOf(int obj, int owner) {
 			return;
 		}
 	}
+	if ((owner == 2) && (_gameId == GID_SAMNMAX))
+		SamInventoryHack(obj);
+
 	putOwner(obj, owner);
 	runHook(0);
 }
diff --git a/scumm.h b/scumm.h
index 5c4df6720e..ab72b5560e 100644
--- a/scumm.h
+++ b/scumm.h
@@ -1194,6 +1194,7 @@ struct Scumm {
 	int getOwner(int obj);
 	void putOwner(int obj, int owner);
 	int getObjectRoom(int obj);
+	void SamInventoryHack(int obj);	// FIXME: Sam and Max hack
 
 	void main();