LILLIPUT: Remove duplicated function

3 files changed, 4 insertions, 24 deletions

diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index f50a59551c..93a3578cc5 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -1354,25 +1354,6 @@ int LilliputEngine::sub16B0C(int param1, int param2) {
 	return _array16B04[var2l];
 }
 
-int LilliputEngine::sub168DA(int x, int y) {
-
-	int* buffer1 = _rulesBuffer12_1;
-	int* buffer2 = _rulesBuffer12_2;
-
-	for (int i = 0; i < _rulesChunk12_size; i++) {
-		if(x >= (*buffer1 >> 8) && x <= (*buffer1 & 0xff)
-			&& y >= (*buffer2 >> 8) && y <= (*buffer2 & 0xff))
-		{
-			return buffer1 - _rulesBuffer12_1;
-		}
-
-		buffer2++;
-		buffer1++;
-	}
-
-	return -1;
-}
-
 int LilliputEngine::sub16799(int param1, int index) {
 	debugC(2, kDebugEngine, "sub16799(%d, %d)", param1, index);
 
@@ -1492,8 +1473,8 @@ uint16 LilliputEngine::sub168DA(byte var1h, byte var1l) {
 	return 0xFFFF;
 }
 
-uint16 LilliputEngine::sub_16901(byte var1h, byte var1l) {
-	debugC(2, kDebugEngine, "sub_16901(%d, %d)", var1h, var1l);
+uint16 LilliputEngine::sub16901(byte var1h, byte var1l) {
+	debugC(2, kDebugEngine, "sub16901(%d, %d)", var1h, var1l);
 
 	for (int i = _rulesChunk12_size-1; i >= 0 ; i--) {
 		if ((var1h >= (_rulesBuffer12_1[i] >> 8)) && (var1h <= (_rulesBuffer12_1[i] & 0xFF)) && (var1h >= (_rulesBuffer12_2[i] >> 8)) && (var1h <= (_rulesBuffer12_2[i] & 0xFF)))
diff --git a/engines/lilliput/lilliput.h b/engines/lilliput/lilliput.h
index 731cbfe7f9..cbe1c52d47 100644
--- a/engines/lilliput/lilliput.h
+++ b/engines/lilliput/lilliput.h
@@ -255,11 +255,10 @@ public:
 	void sub17224(int var1, int var4);
 	void sub17264(int index, int var4);
 	uint16 sub168DA(byte var1h, byte var1l);
-	uint16 sub_16901(byte var1h, byte var1l);
+	uint16 sub16901(byte var1h, byte var1l);
 
 	void renderCharacters(byte *buf, byte x, byte y);
 
-	int sub168DA(int x, int y);
 	int sub16799(int param1, int index);
 	int sub16B0C(int param1, int param2);
 	void addCharToBuf(byte character);
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index 624049f884..a2134135d7 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -72,7 +72,7 @@ LilliputScript::LilliputScript(LilliputEngine *vm) : _vm(vm), _currScript(NULL)
 	}
 
 	for (int i = 0; i < 640; i++) {
-		_array12311[i] = -1;
+		_array12311[i] = 0xFFFF;
 	}
 }