MORTEVIELLE: Some more renaming

4 files changed, 23 insertions, 19 deletions

diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 4fea2638f0..71f0d8f647 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -1386,9 +1386,9 @@ void MortevielleEngine::fctDiscuss() {
 			if (_coreVar._availableQuestion[icm] == '*') {
 				// If question already asked, write it in reverse video
 				if (questionAsked[icm])
-					writetp(lib[icm], 1);
+					displayQuestionText(lib[icm], 1);
 				else
-					writetp(lib[icm], 0);
+					displayQuestionText(lib[icm], 0);
 			}
 
 			if (icm == 23)  {
@@ -1398,7 +1398,7 @@ void MortevielleEngine::fctDiscuss() {
 				posY += 8;
 		}
 		_screenSurface.putxy(320, 176);
-		writetp(lib[46], 0);
+		displayQuestionText(lib[46], 0);
 		char retKey = '\0';
 		bool click;
 		do {
@@ -1423,9 +1423,9 @@ void MortevielleEngine::fctDiscuss() {
 						posX = 0;
 					_screenSurface.putxy(posX, posY);
 					if (questionAsked[choice])
-						writetp(lib[choice], 0);
+						displayQuestionText(lib[choice], 0);
 					else
-						writetp(lib[choice], 1);
+						displayQuestionText(lib[choice], 1);
 					questionAsked[choice] = !questionAsked[choice];
 					choice = 0;
 				}
@@ -1442,9 +1442,9 @@ void MortevielleEngine::fctDiscuss() {
 							posX = 0;
 						_screenSurface.putxy(posX, posY);
 						if (questionAsked[choice])
-							writetp(lib[choice], 0);
+							displayQuestionText(lib[choice], 0);
 						else
-							writetp(lib[choice], 1);
+							displayQuestionText(lib[choice], 1);
 						questionAsked[choice] = ! questionAsked[choice];
 					}
 					if ((_coreVar._availableQuestion[ix] == '*') || (ix == 46)) {
@@ -1455,9 +1455,9 @@ void MortevielleEngine::fctDiscuss() {
 							posX = 0;
 						_screenSurface.putxy(posX, posY);
 						if (questionAsked[ix])
-							writetp(lib[ix], 0);
+							displayQuestionText(lib[ix], 0);
 						else
-							writetp(lib[ix], 1);
+							displayQuestionText(lib[ix], 1);
 						questionAsked[ix] = ! questionAsked[ix];
 						choice = ix;
 					} else
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index 1ced3003e2..e94e1ce7a3 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -1086,24 +1086,24 @@ void ScreenSurface::drawString(const Common::String &l, int command) {
 		i = 10;
 
 	int x = pt.x + i * l.size();
-	int cecr = 0;
+	int color = 0;
 
 	switch (command) {
 	case 1:
 	case 3: {
-		cecr = 0;
+		color = 0;
 		_vm->_screenSurface.fillRect(15, Common::Rect(pt.x, pt.y, x, pt.y + 7));
 		}
 		break;
 	case 4:
-		cecr = 0;
+		color = 0;
 		break;
 	case 5:
-		cecr = 15;
+		color = 15;
 		break;
 	case 0:
 	case 2: {
-		cecr = 15;
+		color = 15;
 		_vm->_screenSurface.fillRect(0, Common::Rect(pt.x, pt.y, x, pt.y + 7));
 		}
 		break;
@@ -1114,7 +1114,7 @@ void ScreenSurface::drawString(const Common::String &l, int command) {
 	pt.x += 1;
 	pt.y += 1;
 	for (x = 1; (x <= (int)l.size()) && (l[x - 1] != 0); ++x) {
-		_vm->_screenSurface.writeCharacter(Common::Point(pt.x, pt.y), ord(l[x - 1]), cecr);
+		_vm->_screenSurface.writeCharacter(Common::Point(pt.x, pt.y), ord(l[x - 1]), color);
 		pt.x += i;
 	}
 	_vm->_mouse.showMouse();
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 0f3d724da3..b990859ac5 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -422,6 +422,7 @@ private:
 	bool decryptNextChar(char &c, int &idx, byte &pt);
 	void displayStatusArrow();
 	void displayStatusInDescriptionBar(char stat);
+	void displayQuestionText(Common::String s, int cmd);
 	void displayTextInDescriptionBar(int x, int y, int nb, int mesgId);
 	void displayTextInVerbBar(Common::String text);
 	void mapMessageId(int &mesgId);
@@ -435,7 +436,6 @@ private:
 	void copcha();
 	void adzon();
 	void phaz(int &rand, int &p, int cf);
-	void writetp(Common::String s, int t);
 	void premtet();
 	void ajchai();
 	void ecr2(Common::String text);
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 994376b1dc..8e0e76f088 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -2957,11 +2957,15 @@ int MortevielleEngine::getPresence(int roomId) {
 	return retVal;
 }
 
-void MortevielleEngine::writetp(Common::String s, int t) {
+/**
+ * Display Question String
+ * @remarks	Originally called 'writetp'
+ */
+void MortevielleEngine::displayQuestionText(Common::String s, int cmd) {
 	if (_resolutionScaler == 2)
-		_screenSurface.drawString(s, t);
+		_screenSurface.drawString(s, cmd);
 	else
-		_screenSurface.drawString(copy(s, 1, 25), t);
+		_screenSurface.drawString(copy(s, 1, 25), cmd);
 }
 
 void MortevielleEngine::aniof(int ouf, int num) {