From e059e81babcb6d0e4eb33382998f59e16e096deb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 18 Sep 2012 00:17:51 +0200
Subject: LILLIPUT: Some renaming, fix a warning

---
 engines/lilliput/lilliput.cpp | 12 ++++++------
 engines/lilliput/lilliput.h   |  2 +-
 engines/lilliput/script.cpp   |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engines/lilliput')

diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index 7c6cd8fe52..b191f2a704 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -692,7 +692,7 @@ void LilliputEngine::moveCharacters() {
 
 	_numCharactersToDisplay = 0;
 	byte index = _numCharacters - 1;
-	Common::Point _pos16213 = Common::Point(_scriptHandler->_viewportPos.x << 3, _scriptHandler->_viewportPos.y << 3);
+	Common::Point pos16213 = Common::Point(_scriptHandler->_viewportPos.x << 3, _scriptHandler->_viewportPos.y << 3);
 
 	for (int i = index; i >= 0; i--) {
 		if (_rulesBuffer2_5[i] != -1) {
@@ -734,8 +734,8 @@ void LilliputEngine::moveCharacters() {
 		if ((tmpVal2 >= 0) && (tmpVal2 <= 7) && (tmpVal3 >= 0) && (tmpVal3 <= 7)) {
 			_characterRelativePositionX[i] = tmpVal2;
 			_characterRelativePositionY[i] = tmpVal3;
-			tmpVal2 = _characterPositionX[i] - _pos16213.x;
-			tmpVal3 = _characterPositionY[i] - _pos16213.y;
+			tmpVal2 = _characterPositionX[i] - pos16213.x;
+			tmpVal3 = _characterPositionY[i] - pos16213.y;
 			int tmpVal4 = _characterPositionAltitude[i];
 			_characterDisplayX[i] = ((60 + tmpVal2 - tmpVal3) * 2) & 0xFF;
 			_characterDisplayY[i] = (20 + tmpVal2 + tmpVal3 - tmpVal4) & 0xFF;
@@ -1887,8 +1887,8 @@ void LilliputEngine::sub12F37() {
 	}
 }
 
-void LilliputEngine::sub13156(bool &forceReturnFl) {
-	debugC(2, kDebugEngine, "sub13156()");
+void LilliputEngine::keyboard_handleInterfaceShortcuts(bool &forceReturnFl) {
+	debugC(2, kDebugEngine, "keyboard_handleInterfaceShortcuts()");
 
 	forceReturnFl = false;
 
@@ -1977,7 +1977,7 @@ void LilliputEngine::handleGameMouseClick() {
 	checkNumericCode();
 
 	bool forceReturnFl = false;
-	sub13156(forceReturnFl);
+	keyboard_handleInterfaceShortcuts(forceReturnFl);
 	if (forceReturnFl)
 		return;
 
diff --git a/engines/lilliput/lilliput.h b/engines/lilliput/lilliput.h
index eca467980f..6f035d810e 100644
--- a/engines/lilliput/lilliput.h
+++ b/engines/lilliput/lilliput.h
@@ -279,7 +279,7 @@ public:
 	void renderCharacters(byte *buf, Common::Point pos);
 
 	void checkNumericCode();
-	void sub13156(bool &forceReturnFl);
+	void keyboard_handleInterfaceShortcuts(bool &forceReturnFl);
 	byte sub16799(int index, Common::Point param1);
 	byte getDirection(Common::Point param1, Common::Point param2);
 	void addCharToBuf(byte character);
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index bf616d830d..853f763e7e 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -1230,9 +1230,9 @@ void LilliputScript::listAllTexts() {
 		int variantCount = 0;
 		while (_vm->_packedStrings[index + variantCount] == 0x5B)
 			++variantCount ;
-		int it = 0;
-	
-		/*if (variantCount != 0) {
+		/*
+		int it = 0;	
+		if (variantCount != 0) {
 			for (int j = 0; j < variantCount; j++) {
 				decodePackedText(&_vm->_packedStrings[index + variantCount + it]);
 				warning("Text 0x%x variant %d : %s", i, j, _vm->_displayStringBuf);
-- 
cgit v1.2.3