6 files changed, 21 insertions, 30 deletions

diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index 9c57ed5b8c..10f0194bf9 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -47,7 +47,8 @@ const int ioresult = 0;
 
 void testfi() {
 	if (ioresult != 0) {
-		caff = Alert::show(err_mess, 1);
+		// Theoritical message
+		warning("IO Error");
 		g_vm->quitGame();
 	}
 }
diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp
index 01e913d51a..86360b018b 100644
--- a/engines/mortevielle/mor2.cpp
+++ b/engines/mortevielle/mor2.cpp
@@ -77,18 +77,18 @@ void tinke() {
 		else
 			stpo = chr(cf + 48);
 
-		stpou = Common::String(d3);
-		stpou += d5;
-		stpou += d4;
-		stpou += d3;
-		stpou += d1;
-		stpou += stpo;
-		stpou += '0';
-		stpou += d2;
-		stpou += d4;
-		stpou += d3;
-		stpou += d6;
-		stpou += d4;
+		_hintPctMessage = Common::String(d3);
+		_hintPctMessage += d5;
+		_hintPctMessage += d4;
+		_hintPctMessage += d3;
+		_hintPctMessage += d1;
+		_hintPctMessage += stpo;
+		_hintPctMessage += '0';
+		_hintPctMessage += d2;
+		_hintPctMessage += d4;
+		_hintPctMessage += d3;
+		_hintPctMessage += d6;
+		_hintPctMessage += d4;
 	}
 	if (m > _minute) {
 		_minute = 30;
@@ -648,7 +648,7 @@ void tfleche() {
 		} while (!(qust || rect || anyone));
 
 		if (qust && (touch == '\103'))
-			Alert::show(stpou, 1);
+			Alert::show(_hintPctMessage, 1);
 	} while (!((touch == '\73') || ((touch == '\104') && (x != 0) && (y != 0)) || (anyone) || (rect)));
 
 	if (touch == '\73')
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index f2bb1ef46c..9c4df1cf9d 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -134,10 +134,7 @@ Common::ErrorCode MortevielleEngine::initialise() {
 		return result;
 
 	// Load some error messages (was previously in chartex())
-	al_mess  = deline(578);  // Insert floppy #1
-	err_mess = deline(579);  // Floppy error
-	ind_mess = deline(580);  // You should have noticed %d hints
-	al_mess2 = deline(581);  // Insert floppy #2
+	_hintPctMessage = deline(580);  // You should have noticed %d hints
 
 	// Set default EGA palette
 	_paletteManager.setDefaultPalette();
@@ -588,7 +585,7 @@ void MortevielleEngine::handleAction() {
 		if (choisi && (msg[3] == MENU_LOAD))
 			g_vm->_savegameManager.loadGame((msg[4] & 7) - 1);
 		if (inkey == '\103') {       /* F9 */
-			temps = Alert::show(stpou, 1);
+			temps = Alert::show(_hintPctMessage, 1);
 			return;
 		} else if (inkey == '\77') {
 			if ((mnumo != OPCODE_NONE) && ((msg[3] == MENU_ACTION) || (msg[3] == MENU_SUB_ACTION))) {
diff --git a/engines/mortevielle/prog.cpp b/engines/mortevielle/prog.cpp
index e2a6cf454c..a41b652b06 100644
--- a/engines/mortevielle/prog.cpp
+++ b/engines/mortevielle/prog.cpp
@@ -35,6 +35,7 @@
 #include "mortevielle/taffich.h"
 #include "mortevielle/var_mor.h"
 #include "mortevielle/mouse.h"
+#include "mortevielle/outtext.h"
 
 namespace Mortevielle {
 
@@ -112,7 +113,7 @@ void MortevielleEngine::gameLoaded() {
 	iouv = 0;
 	dobj = 0;
 	affrep();
-	stpou = ind_mess;
+	_hintPctMessage = deline(580);
 	while ((test[k] == false) && (k < 2)) {
 		++k;
 
diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp
index daac97704d..d3a44c46e6 100644
--- a/engines/mortevielle/var_mor.cpp
+++ b/engines/mortevielle/var_mor.cpp
@@ -174,13 +174,9 @@ int x,
 int t_cph[6401];
 byte tabdon[4001];
 
-Common::String stpou;               // Provides the % of hints
+Common::String _hintPctMessage;               // Provides the % of hints
 byte is;
 byte mode;
-Common::String al_mess,
-       err_mess,
-       ind_mess,
-       al_mess2;
 
 int nbrep[9];
 int nbrepm[9];
diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h
index af8ef9d60f..0956b23e2f 100644
--- a/engines/mortevielle/var_mor.h
+++ b/engines/mortevielle/var_mor.h
@@ -324,13 +324,9 @@ extern int x,
 extern int t_cph[6401];
 extern byte tabdon[4001];
 
-extern Common::String stpou;                               /* donne le % d'indices */
+extern Common::String _hintPctMessage;      // gives the pct of hints found
 extern byte is;
 extern byte mode;
-extern Common::String al_mess,
-       err_mess,
-       ind_mess,
-       al_mess2;
 
 extern int nbrep[9];
 extern int nbrepm[9];