From f06dbf19af0c0a120fc7ee490350ebc55bfb27af Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 30 Apr 2012 11:57:57 +0200
Subject: LILLIPUT: Fix a bug on 16675

---
 engines/lilliput/lilliput.cpp | 15 +++++++--------
 engines/lilliput/lilliput.h   |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index 53e3f24902..d8f3eb3bdd 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -1672,21 +1672,19 @@ void LilliputEngine::sub1305C(byte index, byte button) {
 	displayFunction8();
 }
 
-int LilliputEngine::sub16685(int idx, int var1) {
+void LilliputEngine::sub16685(int idx, int var1) {
 	debugC(2, kDebugEngine, "sub16685(%d, %d)", idx, var1);
 
 	int index = (idx << 5) + (var1 & 0xFF);
-	byte tmpVal = _rulesBuffer2_16[index];
-	_scriptHandler->_array10AB1[idx] = tmpVal;
-	return var1;
+	_scriptHandler->_array10AB1[idx] = _rulesBuffer2_16[index];
 }
 
 int LilliputEngine::sub16675(int idx, int var1) {
 	debugC(2, kDebugEngine, "sub16675(%d, %d)", idx, var1);
 
-	int index = sub16685(idx, var1);
-
-	switch (index) {
+	sub16685(idx, var1);
+	int index = (var1 & 0xFF);	
+	switch (var1 >> 8) {
 	case 0:
 		break;
 	case 1:
@@ -1720,7 +1718,7 @@ int LilliputEngine::sub16675(int idx, int var1) {
 		sub166D8(index);
 		break;
 	default:
-		warning("sub16675 - Unexpected value %d", index);
+		warning("sub16675 - Unexpected value %d", var1 >> 8);
 	}
 
 	return 0;
@@ -2341,6 +2339,7 @@ void LilliputEngine::handleGameScripts() {
 	_scriptHandler->_characterScriptEnabled[index] = 0;
 	sub170EE(index);
 
+
 	_word16EFE = _array11D49[index];
 	_array11D49[index] = 0xFFFF;
 	_word1817B = 0;
diff --git a/engines/lilliput/lilliput.h b/engines/lilliput/lilliput.h
index 54f8423298..082f6f2df8 100644
--- a/engines/lilliput/lilliput.h
+++ b/engines/lilliput/lilliput.h
@@ -257,7 +257,7 @@ public:
 	void prepareGoldAmount(int param1);
 	void sub12F37();
 	int sub16675(int idx, int var1);
-	int sub16685(int idx, int var1);
+	void sub16685(int idx, int var1);
 	void sub16EBC();
 	void sub16CA0();
 	int sub166DD(int index, int var1);
-- 
cgit v1.2.3