From de3566e82e4cf0db2e05c538bc3793389ad14e40 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 23 Jul 2013 10:18:08 +0200
Subject: MORTEVIELLE: Some more renaming

---
 engines/mortevielle/actions.cpp | 4 ++--
 engines/mortevielle/outtext.cpp | 6 +++---
 engines/mortevielle/utils.cpp   | 9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'engines/mortevielle')

diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 62caa4829f..0d2d8b4d1c 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -474,7 +474,7 @@ void MortevielleEngine::fctSelftLook() {
  * @remarks	Originally called 'tfouiller'
  */
 void MortevielleEngine::fctSearch() {
-	static const byte r[14] = {123, 104, 123, 131, 131, 123, 104, 131, 123, 123, 106, 123, 123, 107};
+	static const byte answerArr[14] = {123, 104, 123, 131, 131, 123, 104, 131, 123, 123, 106, 123, 123, 107};
 
 	if (_caff > 99) {
 		getSearchDescription(_caff);
@@ -542,7 +542,7 @@ void MortevielleEngine::fctSearch() {
 			_coreVar._faithScore += 3;
 		_crep = 997;
 		if (_coreVar._currPlace < CELLAR)
-			_crep = r[_coreVar._currPlace];
+			_crep = answerArr[_coreVar._currPlace];
 
 		if ((_coreVar._currPlace == TOILETS) && (_num == 2))
 			_crep = 162;
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index e14fff0227..3afab7c80b 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -289,7 +289,7 @@ void TextHandler::taffich() {
 				drawingStartPos += _vm->_drawingSizeArr[cx + 89];
 			drawingSize = _vm->_drawingSizeArr[b + 89];
 			filename = "AXX.mor";
-		} else if (b == 50) {
+		} else { // b == 50
 			// CHECKME: the size of AZZ.mor is 1280 for the DOS version
 			//          and 1260 for the Amiga version. Maybe the 20 bytes 
 			//          are a filler (to get 10 blocks of 128 bytes), 
@@ -300,8 +300,8 @@ void TextHandler::taffich() {
 		loadAniFile(filename, drawingStartPos, drawingSize);
 	}
 	_vm->_mouse.showMouse();
-	if ((a < 27) && ((_vm->_maff < 27) || (_vm->_coreVar._currPlace == LANDING)) && (_vm->_currAction != OPCODE_ENTER)) {
-		if ((a == 13) || (a == 14))
+	if ((a < COAT_ARMS) && ((_vm->_maff < COAT_ARMS) || (_vm->_coreVar._currPlace == LANDING)) && (_vm->_currAction != OPCODE_ENTER)) {
+		if ((a == ATTIC) || (a == CELLAR))
 			_vm->displayAloneText();
 		else if (!_vm->_blo)
 			_vm->getPresence(_vm->_coreVar._currPlace);
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index a0749a9ac7..c9b40c475f 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -254,10 +254,11 @@ void MortevielleEngine::handleAction() {
 	const int lim = 20000;
 	int temps = 0;
 	char inkey = '\0';
-	bool oo, funct = 0;
+	bool funct = false;
 
 	clearVerbBar();
-	oo = false;
+
+	bool handledOpcodeFl = false;
 	_controlMenu = 0;
 	if (!_keyPressedEsc) {
 		_menu.drawMenu();
@@ -325,7 +326,7 @@ void MortevielleEngine::handleAction() {
 						return;
 
 					if ((_currAction == OPCODE_SOUND) || (_currAction == OPCODE_LIFT)) {
-						oo = true;
+						handledOpcodeFl = true;
 						if ((_currAction == OPCODE_LIFT) || (_obpart)) {
 							endSearch();
 							_caff = _coreVar._currPlace;
@@ -337,7 +338,7 @@ void MortevielleEngine::handleAction() {
 				}
 			}
 			do {
-				if (! oo)
+				if (!handledOpcodeFl)
 					handleOpcode();
 
 				if ((_controlMenu == 0) && (! _loseGame) && (! _endGame)) {
-- 
cgit v1.2.3