MORTEVIELLE: Rename remaining Menu enums, rename _staticStrings into _engineStrings as a preliminar work on an English DOS version

9 files changed, 89 insertions, 87 deletions

diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 6aea0e691d..68d6e82c43 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -58,7 +58,7 @@ void fctMove() {
 	}
 	if ((s.mlieu == 15) && (msg[4] == g_vm->_menu._depl[6])) {
 		if (!syn)
-			ecr3(g_vm->getString(S_GO_TO));
+			ecr3(g_vm->getEngineString(S_GO_TO));
 		tfleche();
 		if (iesc)
 			okdes = false;
@@ -222,7 +222,7 @@ void fctTake() {
 		return;
 	}
 	if (!syn)
-		ecr3(g_vm->getString(S_TAKE));
+		ecr3(g_vm->getEngineString(S_TAKE));
 	tfleche();
 	if ((anyone) || (iesc))
 		return;
@@ -321,7 +321,7 @@ void fctLift() {
 	int cx;
 
 	if (!syn)
-		ecr3(g_vm->getString(S_LIFT));
+		ecr3(g_vm->getEngineString(S_LIFT));
 	tfleche();
 	if ((anyone) || (iesc))
 		return;
@@ -360,7 +360,7 @@ void fctRead() {
 		st4(caff);
 	else {
 		if (!syn)
-			ecr3(g_vm->getString(S_READ));
+			ecr3(g_vm->getEngineString(S_READ));
 		tfleche();
 		if (!(anyone) && !(iesc)) {
 			tcoord(4);
@@ -389,7 +389,7 @@ void fctLook() {
 		return;
 	}
 	if (!syn)
-		ecr3(g_vm->getString(S_LOOK));
+		ecr3(g_vm->getEngineString(S_LOOK));
 	tfleche();
 	if ((anyone) || (iesc))
 		return;
@@ -475,7 +475,7 @@ void fctSearch() {
 		return;
 	}
 	if (!syn)
-		ecr3(g_vm->getString(S_SEARCH));
+		ecr3(g_vm->getEngineString(S_SEARCH));
 	tfleche();
 	if (anyone || iesc)
 		return;
@@ -563,7 +563,7 @@ void fctOpen() {
 	int cx, haz;
 
 	if (!syn)
-		ecr3(g_vm->getString(S_OPEN));
+		ecr3(g_vm->getEngineString(S_OPEN));
 	if (caff == 26) {
 		if (ment != 0) {
 			msg[4] = OPCODE_ENTER;
@@ -631,7 +631,7 @@ void fctPlace() {
 		return;
 	}
 	if (!syn)
-		ecr3(g_vm->getString(S_PUT));
+		ecr3(g_vm->getEngineString(S_PUT));
 	tfleche();
 	if (iesc)
 		crep = 998;
@@ -671,7 +671,7 @@ void fctPlace() {
 					parole(6, -9, 1);
 
 					// Do you want to enter the hidden passage?
-					int answer = Alert::show(g_vm->getString(S_YES_NO), 1);
+					int answer = Alert::show(g_vm->getEngineString(S_YES_NO), 1);
 					if (answer== 1)  {
 						deline(582, st, tay);
 						i = Alert::show(delig, 1);
@@ -752,7 +752,7 @@ void fctTurn() {
 		return;
 	}
 	if (!syn)
-		ecr3(g_vm->getString(S_TURN));
+		ecr3(g_vm->getEngineString(S_TURN));
 	tfleche();
 	if ((anyone) || (iesc))
 		return;
@@ -762,7 +762,7 @@ void fctTurn() {
 		if ((s.mlieu == 13) && (s.ibag == 159) && (s.iboul == 141)) {
 			repon(2, 167);
 			parole(7, 9, 1);
-			int answer = Alert::show(g_vm->getString(S_YES_NO), 1);
+			int answer = Alert::show(g_vm->getEngineString(S_YES_NO), 1);
 			if (answer == 1)
 				g_vm->_endGame = true;
 			else
@@ -772,7 +772,7 @@ void fctTurn() {
 			repon(2, 175);
 			clsf3();
 			parole(6, -9, 1);
-			int answer = Alert::show(g_vm->getString(S_YES_NO), 1);
+			int answer = Alert::show(g_vm->getEngineString(S_YES_NO), 1);
 			if (answer == 1) {
 				s.mlieu = 16;
 				affrep();
@@ -788,7 +788,7 @@ void fctTurn() {
  */
 void fctHideSelf() {
 	if (!syn)
-		ecr3(g_vm->getString(S_HIDE_SELF));
+		ecr3(g_vm->getEngineString(S_HIDE_SELF));
 	tfleche();
 	if (!(anyone) && !(iesc)) {
 		tcoord(10);
@@ -810,7 +810,7 @@ void fctAttach() {
 		crep = 186;
 	else {
 		if (!syn)
-			ecr3(g_vm->getString(S_TIE));
+			ecr3(g_vm->getEngineString(S_TIE));
 		tfleche();
 		if (!(anyone) && !(iesc)) {
 			tcoord(8);
@@ -836,7 +836,7 @@ void fctClose() {
 	int cx, chai;
 
 	if (!syn)
-		ecr3(g_vm->getString(S_CLOSE));
+		ecr3(g_vm->getEngineString(S_CLOSE));
 	if (caff < 26) {
 		tfleche();
 		if (iesc)
@@ -875,9 +875,9 @@ void fctKnock() {
 	int l, p, haz;
 
 	if (!syn)
-		ecr3(g_vm->getString(S_HIT));
+		ecr3(g_vm->getEngineString(S_HIT));
 	if (s.mlieu == 15) {
-		l = Alert::show(g_vm->getString(S_BEFORE_USE_DEP_MENU), 1);
+		l = Alert::show(g_vm->getEngineString(S_BEFORE_USE_DEP_MENU), 1);
 		return;
 	}
 	if (s.mlieu < 25) {
@@ -917,7 +917,7 @@ void fctPut() {
 	int cx, chai;
 
 	if (!syn)
-		ecr3(g_vm->getString(S_POSE));
+		ecr3(g_vm->getEngineString(S_POSE));
 	if (s.derobj == 0)
 		crep = 186;
 	else {
@@ -1154,7 +1154,7 @@ void fctSleep() {
 	clsf3();
 	clsf2();
 	ecrf2();
-	ecr2(g_vm->getString(S_WANT_TO_WAKE_UP));
+	ecr2(g_vm->getEngineString(S_WANT_TO_WAKE_UP));
 	calch(j, h, m);
 
 	int answer;
@@ -1172,7 +1172,7 @@ void fctSleep() {
 		if (h > 23)
 			h = 0;
 		tinke();
-		answer = Alert::show(g_vm->getString(S_YES_NO), 1);
+		answer = Alert::show(g_vm->getEngineString(S_YES_NO), 1);
 		anyone = false;
 	} while (answer != 1);
 	crep = 998;
@@ -1185,7 +1185,7 @@ void fctSleep() {
  */
 void fctForce() {
 	if (!syn)
-		ecr3(g_vm->getString(S_SMASH));
+		ecr3(g_vm->getEngineString(S_SMASH));
 	if (caff < 25)
 		tfleche();
 	if ((! anyone) && (! iesc))
@@ -1261,7 +1261,7 @@ void fctWait() {
 			return;
 		}
 		repon(2, 102);
-		answer = Alert::show(g_vm->getString(S_YES_NO), 1);
+		answer = Alert::show(g_vm->getEngineString(S_YES_NO), 1);
 	} while (answer != 2);
 	crep = 998;
 	if (!anyone)
@@ -1274,7 +1274,7 @@ void fctWait() {
  */
 void fctSound() {
 	if (!syn)
-		ecr3(g_vm->getString(S_PROBE2));
+		ecr3(g_vm->getEngineString(S_PROBE2));
 	if (caff < 27) {
 		tfleche();
 		if (!(anyone) && (!iesc))
@@ -1289,7 +1289,7 @@ void fctSound() {
  */
 void fctDiscuss() {
 	bool te[47];
-	int ix, cy, cx, max, haz, suj, co, lig, icm,
+	int cy, cx, max, haz, suj, co, lig, icm,
 	        i, tay, choi, x, y, c;
 	char tou;
 	Common::String lib[47];
@@ -1316,9 +1316,9 @@ void fctDiscuss() {
 	premtet();
 	sparl(0, suj);
 	hirs();
-	for (ix = 1; ix <= 46; ++ix)
+	for (int ix = 1; ix <= 46; ++ix)
 		te[ix] = false;
-	for (ix = 1; ix <= 45; ++ix) {
+	for (int ix = 1; ix <= 45; ++ix) {
 		deline(ix + c_tparler, st, tay);
 		lib[ix] = delig;
 		for (i = tay; i <= 40; ++i)
@@ -1376,7 +1376,7 @@ void fctDiscuss() {
 					choi = 0;
 				}
 			} else {
-				ix = cy;
+				int ix = cy;
 				if (cx == 41)
 					ix = ix + 23;
 				if (ix != choi) {
@@ -1413,7 +1413,7 @@ void fctDiscuss() {
 		} while (!((tou == '\15') || (((c != 0) || g_vm->getMouseClick()) && (choi != 0))));
 		g_vm->setMouseClick(false);
 		if (choi != 46) {
-			ix = choi - 1;
+			int ix = choi - 1;
 			if (col) {
 				col = false;
 				s.mlieu = 15;
@@ -1446,7 +1446,7 @@ void fctDiscuss() {
 				s.teauto[7] = '*';
 			}
 			if ((suj == 106) || (suj == 108) || (suj == 94)) {
-				for (ix = 29; ix <= 31; ++ix)
+				for (int ix = 29; ix <= 31; ++ix)
 					s.teauto[ix] = '*';
 				s.pourc[7] = '*';
 			}
@@ -1491,7 +1491,7 @@ void fctSmell() {
 	crep = 119;
 	if (caff < 26) {
 		if (!syn)
-			ecr3(g_vm->getString(S_SMELL));
+			ecr3(g_vm->getEngineString(S_SMELL));
 		tfleche();
 		if (!(anyone) && !(iesc))
 			if (caff == 16)
@@ -1509,7 +1509,7 @@ void fctScratch() {
 	crep = 155;
 	if (caff < 27) {
 		if (!syn)
-			ecr3(g_vm->getString(S_SCRATCH));
+			ecr3(g_vm->getEngineString(S_SCRATCH));
 		tfleche();
 	}
 	num = 0;
@@ -1570,7 +1570,7 @@ void MortevielleEngine::loseGame() {
 	_hour = 10;
 	_day = 0;
 	repon(2, 180);
-	answer = Alert::show(g_vm->getString(S_YES_NO), 1);
+	answer = Alert::show(g_vm->getEngineString(S_YES_NO), 1);
 	_quitGame = (answer != 1);
 }
 
diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index 5c53616e25..b91fd30ee3 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -424,8 +424,8 @@ bool Ques::show() {
  * Draw the F3/F8 dialog
  */
 void f3f8::draw() {
-	Common::String f3 = g_vm->getString(S_F3);
-	Common::String f8 = g_vm->getString(S_F8);
+	Common::String f3 = g_vm->getEngineString(S_F3);
+	Common::String f8 = g_vm->getEngineString(S_F8);
 
 	// Write the F3 and F8 text strings
 	g_vm->_screenSurface.putxy(3, 44);
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index bb901a15d8..f81a454ab9 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -56,7 +56,7 @@ void Menu::menut(int no, Common::String nom) {
 		s += ' ';
 
 	switch (h) {
-	case invent:
+	case MENU_INVENTORY:
 		if (l != 7) {
 			_inv[l] = s;
 			_inv[l].insertChar(' ', 0);
@@ -65,10 +65,10 @@ void Menu::menut(int no, Common::String nom) {
 	case MENU_MOVE:
 		_dep[l] = s;
 		break;
-	case action:
+	case MENU_ACTION:
 		_act[l] = s;
 		break;
-	case saction:
+	case MENU_SUB_ACTION:
 		_self[l] = s;
 		break;
 	case MENU_DISCUSS:
@@ -88,7 +88,7 @@ void Menu::disableMenuItem(int no) {
 	byte l = lo(no);
 
 	switch (h) {
-	case invent:
+	case MENU_INVENTORY:
 		if (l > 6) {
 			_inv[l].setChar('<', 0);
 			_inv[l].setChar('>', 21);
@@ -98,10 +98,10 @@ void Menu::disableMenuItem(int no) {
 	case MENU_MOVE:
 		_dep[l].setChar('*', 0);
 		break;
-	case action:
+	case MENU_ACTION:
 		_act[l].setChar('*', 0);
 		break;
-	case saction:
+	case MENU_SUB_ACTION:
 		_self[l].setChar('*', 0);
 		break;
 	case MENU_DISCUSS:
@@ -121,17 +121,17 @@ void Menu::enableMenuItem(int no) {
 	byte l = lo(no);
 
 	switch (h) {
-	case invent :
+	case MENU_INVENTORY:
 		_inv[l].setChar(' ', 0);
 		_inv[l].setChar(' ', 21);
 		break;
 	case MENU_MOVE:
 		_dep[l].setChar(' ', 0);
 		break;
-	case action:
+	case MENU_ACTION:
 		_act[l].setChar(' ', 0);
 		break;
-	case saction:
+	case MENU_SUB_ACTION:
 		_self[l].setChar(' ', 0);
 		_self[l].setChar(' ', 0);
 		break;
@@ -222,18 +222,18 @@ void Menu::invers(int ix) {
 		s = _dis[lo(msg4)];
 		break;
 	case 6:
-		s = g_vm->getString(S_SAVE_LOAD + lo(msg4));
+		s = g_vm->getEngineString(S_SAVE_LOAD + lo(msg4));
 		break;
 	case 7:
-		s = g_vm->getString(S_SAVE_LOAD + 1);
+		s = g_vm->getEngineString(S_SAVE_LOAD + 1);
 		s += ' ';
 		s += (char)(48 + lo(msg4));
 		break;
 	case 8:
 		if (lo(msg4) == 1) {
-			s = g_vm->getString(S_RESTART);
+			s = g_vm->getEngineString(S_RESTART);
 		} else {
-			s = g_vm->getString(S_SAVE_LOAD + 2);
+			s = g_vm->getEngineString(S_SAVE_LOAD + 2);
 			s += ' ';
 			s += (char)(47 + lo(msg4));
 		}
@@ -324,10 +324,10 @@ void Menu::menuDown(int ii) {
 				g_vm->_screenSurface.writeg(_dis[cx], 4);
 			break;
 		case 6:
-			g_vm->_screenSurface.writeg(g_vm->getString(S_SAVE_LOAD + cx), 4);
+			g_vm->_screenSurface.writeg(g_vm->getEngineString(S_SAVE_LOAD + cx), 4);
 			break;
 		case 7: {
-			Common::String s = g_vm->getString(S_SAVE_LOAD + 1);
+			Common::String s = g_vm->getEngineString(S_SAVE_LOAD + 1);
 			s += ' ';
 			s += (char)(48 + cx);
 			g_vm->_screenSurface.writeg(s, 4);
@@ -335,9 +335,9 @@ void Menu::menuDown(int ii) {
 			break;
 		case 8:
 			if (cx == 1)
-				g_vm->_screenSurface.writeg(g_vm->getString(S_RESTART), 4);
+				g_vm->_screenSurface.writeg(g_vm->getEngineString(S_RESTART), 4);
 			else {
-				Common::String s = g_vm->getString(S_SAVE_LOAD + 2);
+				Common::String s = g_vm->getEngineString(S_SAVE_LOAD + 2);
 				s += ' ';
 				s += (char)(47 + cx);
 				g_vm->_screenSurface.writeg(s, 4);
@@ -416,20 +416,20 @@ void Menu::mdn() {
 		   || ((x > 268 * res) && (x < 268 * res + 24)));
 		if (tes) {
 			if (x < 76 * res)
-				ix = invent;
+				ix = MENU_INVENTORY;
 			else if (x < 124 * res)
 				ix = MENU_MOVE;
 			else if (x < 172 * res)
-				ix = action;
+				ix = MENU_ACTION;
 			else if (x < 220 * res)
-				ix = saction;
+				ix = MENU_SUB_ACTION;
 			else if (x < 268 * res)
 				ix = MENU_DISCUSS;
 			else
-				ix = fichier;
+				ix = MENU_FILE;
 
 			if ((ix != msg3) || (! test0))
-				if (!((ix == fichier) && ((msg3 == sauve) || (msg3 == charge)))) {
+				if (!((ix == MENU_FILE) && ((msg3 == MENU_SAVE) || (msg3 == MENU_LOAD)))) {
 					menuUp(msg3);
 					menuDown(ix);
 					msg3 = ix;
@@ -440,7 +440,7 @@ void Menu::mdn() {
 				util(x, y);
 		}
 	} else {       // There was a click
-		if ((msg3 == fichier) && (msg4 != OPCODE_NONE)) {
+		if ((msg3 == MENU_FILE) && (msg4 != OPCODE_NONE)) {
 			// Another menu to be _displayed
 			g_vm->setMouseClick(false);
 			menuUp(msg3);
diff --git a/engines/mortevielle/menu.h b/engines/mortevielle/menu.h
index 1fb8ad45c6..84169241c3 100644
--- a/engines/mortevielle/menu.h
+++ b/engines/mortevielle/menu.h
@@ -60,8 +60,8 @@ public:
 };
 
 enum {
-	invent = 1, MENU_MOVE = 2, action = 3, saction = 4,
-	MENU_DISCUSS = 5, fichier = 6, sauve = 7, charge = 8
+	MENU_INVENTORY = 1, MENU_MOVE = 2, MENU_ACTION = 3, MENU_SUB_ACTION = 4,
+	MENU_DISCUSS = 5,   MENU_FILE = 6, MENU_SAVE = 7,   MENU_LOAD = 8
 };
 
 } // End of namespace Mortevielle
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index f8873c66b0..f36ae2dff5 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -244,11 +244,11 @@ void clsf10() {
 	}
 	g_vm->_screenSurface.fillRect(15, Common::Rect(cod, 93, co, 98));
 	if (s.conf < 33)
-		st = g_vm->getString(S_COOL);
+		st = g_vm->getEngineString(S_COOL);
 	else if (s.conf < 66)
-		st = g_vm->getString(S_LOURDE);
+		st = g_vm->getEngineString(S_LOURDE);
 	else if (s.conf > 65)
-		st = g_vm->getString(S_MALSAINE);
+		st = g_vm->getEngineString(S_MALSAINE);
 	
 	co = 580 - (g_vm->_screenSurface.getStringWidth(st) / 2);
 	g_vm->_screenSurface.putxy(co, 92);
@@ -598,9 +598,9 @@ void person() {
 	for (int cf = 1; cf <= 8; ++cf)
 		g_vm->_menu.disableMenuItem(g_vm->_menu._disc[cf]);
 
-	Common::String sYou = g_vm->getString(S_YOU);
-	Common::String sAre = g_vm->getString(S_ARE);
-	Common::String sAlone = g_vm->getString(S_ALONE);
+	Common::String sYou = g_vm->getEngineString(S_YOU);
+	Common::String sAre = g_vm->getEngineString(S_ARE);
+	Common::String sAlone = g_vm->getEngineString(S_ALONE);
 
 	clsf10();
 	g_vm->_screenSurface.putxy(580 - (g_vm->_screenSurface.getStringWidth(sYou) / 2), 30);
@@ -661,7 +661,7 @@ void drawClock() {
 
 	g_vm->_screenSurface.putxy(550, 160);
 	if ((_day >= 0) && (_day <= 8)) {
-		Common::String tmp = g_vm->getString(S_DAY);
+		Common::String tmp = g_vm->getEngineString(S_DAY);
 		tmp.insertChar((char)(_day + 49), 0);
 		g_vm->_screenSurface.writeg(tmp, 1);
 	}
@@ -1306,12 +1306,14 @@ void cavegre() {
 		s.conf += (s.conf / 10);
 	clsf3();
 	ecrf2();
-	ecr3(g_vm->getString(S_SOMEONE_ENTERS));
+	ecr3(g_vm->getEngineString(S_SOMEONE_ENTERS));
 	haz = (hazard(0, 4)) - 2;
 	parole(2, haz, 1);
 
 	// Useless?
-	for (haz = 0; haz <= 3000; ++haz);
+	for (haz = 0; haz <= 3000; ++haz)
+		;
+
 	clsf3();
 	person();
 }
diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp
index c235186c8a..fb1ccafa31 100644
--- a/engines/mortevielle/mor2.cpp
+++ b/engines/mortevielle/mor2.cpp
@@ -40,12 +40,12 @@
 namespace Mortevielle {
 
 void tinke() {
-	Common::String d1 = g_vm->getString(S_SHOULD_HAVE_NOTICED);
-	Common::String d2 = g_vm->getString(S_NUMBER_OF_HINTS);
+	Common::String d1 = g_vm->getEngineString(S_SHOULD_HAVE_NOTICED);
+	Common::String d2 = g_vm->getEngineString(S_NUMBER_OF_HINTS);
 	const char d3 = '[';
 	const char d4 = ']';
 	const char d5 = '1';
-	Common::String d6 = g_vm->getString(S_OK);
+	Common::String d6 = g_vm->getEngineString(S_OK);
 	int cx, haz, nh, cf, j, h, m;
 	Common::String stpo;
 	bool am;
@@ -169,7 +169,7 @@ void tinke() {
 						if (haz < 5) {
 							clsf3();
 							ecrf2();
-							ecr3(g_vm->getString(S_HEAR_NOISE));
+							ecr3(g_vm->getEngineString(S_HEAR_NOISE));
 							haz = (hazard(0, 4)) - 2;
 							parole(1, haz, 1);
 							clsf3();
@@ -286,8 +286,8 @@ void mfouen() {
 	for (cx = 1; cx <= 11; ++cx)
 		g_vm->_menu.enableMenuItem(men[cx]);
 
-	g_vm->_menu.menut(OPCODE_SOUND, g_vm->getString(S_PROBE));
-	g_vm->_menu.menut(OPCODE_LIFT, g_vm->getString(S_RAISE));
+	g_vm->_menu.menut(OPCODE_SOUND, g_vm->getEngineString(S_PROBE));
+	g_vm->_menu.menut(OPCODE_LIFT, g_vm->getEngineString(S_RAISE));
 }
 
 /* NIVEAU 6 */
@@ -434,8 +434,8 @@ void mfoudi() {
 	for (int cx = 1; cx <= 11; ++cx)
 		g_vm->_menu.disableMenuItem(men[cx]);
 
-	g_vm->_menu.menut(OPCODE_SOUND, g_vm->getString(S_SUITE));
-	g_vm->_menu.menut(OPCODE_LIFT, g_vm->getString(S_STOP));
+	g_vm->_menu.menut(OPCODE_SOUND, g_vm->getEngineString(S_SUITE));
+	g_vm->_menu.menut(OPCODE_LIFT, g_vm->getEngineString(S_STOP));
 }
 
 void mennor() {
@@ -812,7 +812,7 @@ void st13(int ob) {
 }
 
 void aldepl() {
-	Alert::show(g_vm->getString(S_USE_DEP_MENU), 1);
+	Alert::show(g_vm->getEngineString(S_USE_DEP_MENU), 1);
 }
 
 } // End of namespace Mortevielle
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 6be14bdfa9..4f367412fc 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -212,7 +212,7 @@ Common::ErrorCode MortevielleEngine::loadMortDat() {
 	// Close the file
 	f.close();
 
-	assert(_staticStrings.size() > 0);
+	assert(_engineStrings.size() > 0);
 	return Common::kNoError;
 }
 
@@ -240,7 +240,7 @@ void MortevielleEngine::readStaticStrings(Common::File &f, int dataSize) {
 		while ((ch = (char)f.readByte()) != '\0')
 			s += ch;
 		
-		_staticStrings.push_back(s);
+		_engineStrings.push_back(s);
 		dataSize -= s.size() + 1;
 	}
 	assert(dataSize == 0);
@@ -565,19 +565,19 @@ void MortevielleEngine::handleAction() {
 			changeGraphicalDevice((uint)(ord(inkey) - 1) >> 1);
 			return;
 		}
-		if (choisi && (msg[3] == sauve)) {
+		if (choisi && (msg[3] == MENU_SAVE)) {
 			Common::String saveName = Common::String::format("Savegame #%d", msg[4] & 7);
 			g_vm->_savegameManager.saveGame(msg[4] & 7, saveName);
 		}
-		if (choisi && (msg[3] == charge))
+		if (choisi && (msg[3] == MENU_LOAD))
 			g_vm->_savegameManager.loadGame((msg[4] & 7) - 1);
 		if (inkey == '\103') {       /* F9 */
 			temps = Alert::show(stpou, 1);
 			return;
 		} else if (inkey == '\77') {
-			if ((mnumo != OPCODE_NONE) && ((msg[3] == action) || (msg[3] == saction))) {
+			if ((mnumo != OPCODE_NONE) && ((msg[3] == MENU_ACTION) || (msg[3] == MENU_SUB_ACTION))) {
 				msg[4] = mnumo;
-				ecr3(g_vm->getString(S_IDEM));
+				ecr3(g_vm->getEngineString(S_IDEM));
 			} else
 				return;
 		} else if (inkey == '\104') {
@@ -598,7 +598,7 @@ void MortevielleEngine::handleAction() {
 				num = 0;
 		} else {
 			mnumo = msg[3];
-			if ((msg[3] == action) || (msg[3] == saction))
+			if ((msg[3] == MENU_ACTION) || (msg[3] == MENU_SUB_ACTION))
 				mnumo = msg[4];
 			if (! anyone) {
 				if ((fouil) || (obpart)) {
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index b0f1c4cffe..07c5896086 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -80,7 +80,7 @@ private:
 	bool _mouseClick;
 	Common::Point _mousePos;
 	bool _inMainGameLoop;	// Flag when the main game loop is active
-	Common::StringArray _staticStrings;
+	Common::StringArray _engineStrings;
 
 	Common::ErrorCode initialise();
 	Common::ErrorCode loadMortDat();
@@ -124,7 +124,7 @@ public:
 	bool getMouseClick() const { return _mouseClick; }
 	void setMouseClick(bool v) { _mouseClick = v; }
 	void delay(int amount);
-	Common::String getString(int idx) const { return _staticStrings[idx]; }
+	Common::String getEngineString(int idx) const { return _engineStrings[idx]; }
 
 	void endGame();
 	void loseGame();
diff --git a/engines/mortevielle/prog.cpp b/engines/mortevielle/prog.cpp
index 96083f1fc8..e2a6cf454c 100644
--- a/engines/mortevielle/prog.cpp
+++ b/engines/mortevielle/prog.cpp
@@ -174,7 +174,7 @@ void tsitu() {
 		fctMove();
 	if (msg[3] == MENU_DISCUSS)
 		fctDiscuss();
-	if (msg[3] == invent)
+	if (msg[3] == MENU_INVENTORY)
 		tsprendre(); //Translation: inventory/take
 	if (msg[4] == OPCODE_ATTACH)
 		fctAttach();