10 files changed, 26 insertions, 32 deletions

diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 83ad8d4f6b..bdb4827ee8 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -442,7 +442,7 @@ L2:
 	int quel;
 	boolean entre;
 	phrase st;
-	str255 str_;
+	Common::String str_;
 	int i, tay;
 
 	if (s.derobj == 0) {
diff --git a/engines/mortevielle/alert.cpp b/engines/mortevielle/alert.cpp
index cec339e29a..f1c69efe64 100644
--- a/engines/mortevielle/alert.cpp
+++ b/engines/mortevielle/alert.cpp
@@ -1,4 +1,4 @@
-/* overlay */ int do_alert(str255 str_, int n);
+/* overlay */ int do_alert(Common::String str_, int n);
 
 
 const int nligne = 7;
@@ -10,7 +10,7 @@ const matrix<1, 2, 1, 3, int> coord
 
 
 
-static void decod(str255 s, int &nbc, int &nbl, int &col, str255 &c, str30 &cs) {
+static void decod(Common::String s, int &nbc, int &nbl, int &col, Common::String &c, Common::String &cs) {
 	int i, k;
 	boolean v;
 
@@ -68,7 +68,7 @@ static void fait_boite(int lidep, int nli, int tx) {
 
 
 
-static void fait_choix(str30 c, int &coldep, int &nbcase, array<1, 2, varying_string<3> > &s, int &esp) {
+static void fait_choix(Common::String c, int &coldep, int &nbcase, array<1, 2, varying_string<3> > &s, int &esp) {
 	int i, l, x;
 	char ch;
 
@@ -89,15 +89,15 @@ static void fait_choix(str30 c, int &coldep, int &nbcase, array<1, 2, varying_st
 	}
 }
 
-int do_alert(str255 str_, int n) {
+int do_alert(Common::String str_, int n) {
 	int coldep, esp, i, l, nbcase, quoi, ix;
-	str255 st, chaine;
+	Common::String st, chaine;
 	matrix<1, 2, 1, 2, int> limit;
 	char c, dumi;
 	array<1, 2, varying_string<3> > s;
 	int cx, cy, cd, nbcol, nblig;
 	boolean touch, newaff, test, test1, test2, test3, dum;
-	str30 cas;
+	Common::String cas;
 
 
 	/*debug('** do_alert **');*/
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index 9018414d28..cd72d7b87b 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -1,8 +1,8 @@
 /* NIVEAU 14*/
 
-/* overlay */ void menut(int no, str30 nom) {
+/* overlay */ void menut(int no, Common::String nom) {
 	byte h, l;
-	str30 s;
+	Common::String s;
 
 
 	/* debug('menut'); */
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index 1ec2332edb..f32ca9672e 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -174,7 +174,7 @@ void ecrf2() {
 	/*boite(0,175,630,15,15);*/
 }
 
-void ecr2(str255 str_) {
+void ecr2(Common::String str_) {
 	int tab;
 	int tlig;
 
@@ -211,7 +211,7 @@ void clsf3() {
 	show_mouse();
 }
 
-void ecr3(str255 text) {
+void ecr3(Common::String text) {
 	/* debug('ecr3 : '+text);*/
 	clsf3();
 	putxy(8, 192);
@@ -324,7 +324,7 @@ void okpas() {
 
 void modobj(int m) {
 	phrase str_;
-	str30 strp;
+	Common::String strp;
 	int i, tay;
 
 	/* debug('modobj'); */
@@ -339,7 +339,7 @@ void modobj(int m) {
 
 void modobj2(int m, boolean t1, boolean t2) {
 	phrase str_;
-	str30 strp;
+	Common::String strp;
 	int i, tay;
 
 	/* debug('modobj'); */
@@ -356,7 +356,7 @@ void modobj2(int m, boolean t1, boolean t2) {
 
 
 void repon(int f, int m) {
-	str255 str_;
+	Common::String str_;
 	varying_string<40> str1;
 	phrase st;
 	text1 fic;
@@ -581,7 +581,7 @@ void person() {
 	const char m2[] = "ˆtes";
 	const char m3[] = "SEUL";
 	int cf;
-	str255 str_;
+	Common::String str_;
 
 	/* debug('person'); */
 	for (cf = 1; cf <= 8; cf ++) menu_disable(disc[cf]);
@@ -1184,7 +1184,7 @@ void phaz(int &haz, int &p, int cf) {
 	person();
 }
 
-void writetp(str255 s, int t) {
+void writetp(Common::String s, int t) {
 	if (res == 2)  writeg(s, t);
 	else writeg(copy(s, 1, 25), t);
 }
diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp
index 48db49b6da..d4bb50b253 100644
--- a/engines/mortevielle/mor2.cpp
+++ b/engines/mortevielle/mor2.cpp
@@ -167,7 +167,7 @@ void tkey1(boolean d) {
 
 void tmlieu(int mli) {
 	int cx, j, i, tail;
-	str30 nomp;
+	Common::String nomp;
 	phrase st;
 
 
@@ -312,7 +312,7 @@ void st1sama() {
 void modinv() {
 	int cx, cy, tay, i, r;
 	phrase nom;
-	str30 nomp;
+	Common::String nomp;
 
 	cy = 0;
 	for (cx = 1; cx <= 6; cx ++)
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index ec7728745d..7c504232aa 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -1,4 +1,4 @@
-str255 delig;
+Common::String delig;
 const array<0, 31, byte> tabdr
 = {{
 		32, 101, 115,  97, 114, 105, 110,
diff --git a/engines/mortevielle/ques.cpp b/engines/mortevielle/ques.cpp
index 6f7a05e0c7..b109340f96 100644
--- a/engines/mortevielle/ques.cpp
+++ b/engines/mortevielle/ques.cpp
@@ -16,7 +16,7 @@
 	phrase st;
 	char key;
 	mult_rect coor;
-	array<1, 14, str40> chaines;
+	array<1, 14, Common::String> chaines;
 	int compte;
 
 
diff --git a/engines/mortevielle/sprint.cpp b/engines/mortevielle/sprint.cpp
index bdb0a1b2fd..d0b1e7cf66 100644
--- a/engines/mortevielle/sprint.cpp
+++ b/engines/mortevielle/sprint.cpp
@@ -6,7 +6,7 @@ void clear_box(int x, int y, int dx) {
 	box(0, gd, pred(int, x) << 3, pred(int, y) << 3, pred(int, x + dx) << 3, y << 3, 255);
 }
 
-void writeg(str255 l, int c)
+void writeg(Common::String l, int c)
 
 {
 	int i, x, xo, yo;
diff --git a/engines/mortevielle/taffich.cpp b/engines/mortevielle/taffich.cpp
index d1e447de71..fad09df9f7 100644
--- a/engines/mortevielle/taffich.cpp
+++ b/engines/mortevielle/taffich.cpp
@@ -1,4 +1,4 @@
-void chardes(str11 nom, long_int passe, int long_) {
+void chardes(Common::String nom, long_int passe, int long_) {
 	int i, p, l;
 	byte b;
 	untyped_file f;
@@ -28,7 +28,7 @@ void chardes(str11 nom, long_int passe, int long_) {
 	/*$i+*/
 }
 
-void charani(str11 nom, long_int passe, int long_) {
+void charani(Common::String nom, long_int passe, int long_) {
 	int i, p, l;
 	byte b;
 	untyped_file f;
@@ -70,7 +70,7 @@ void taffich() {
 	int i, m, a, b, cx, handle,
 	        npal;
 	long_int lgt, lhandle;
-	str11 nom;
+	Common::String nom;
 	int palh, k, j;
 	array<0, 15, int> alllum;
 
diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp
index 0fb4eb0225..fa897f515d 100644
--- a/engines/mortevielle/var_mor.cpp
+++ b/engines/mortevielle/var_mor.cpp
@@ -169,12 +169,7 @@ const byte rang[16] = {15, 14, 11, 7, 13, 12, 10, 6, 9, 5, 3, 1, 2, 4, 8, 0};
 /*--------------------------------   TYPES   --------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-typedef varying_string<11> path_chars;
 typedef float long_int;
-typedef varying_string<255> str255;
-typedef varying_string<125> str125;
-typedef varying_string<30> str30;
-typedef varying_string<11> str11;
 typedef file<byte> fichier_byte;
 struct sav_chaine {
 	int conf;
@@ -217,7 +212,6 @@ struct rectangle {
 };
 
 typedef array<1, max_rect, rectangle> mult_rect;
-typedef varying_string<40> str40;
 
 struct pattern {
 	byte tay, tax;
@@ -344,11 +338,11 @@ int x,
 array<0, 6400, int> t_cph;
 array<0, 4000, byte> tabdon;
 /*   t_dxx  : array[0..121] of int;*/
-str125 stpou;                               /* donne le % d'indices */
+Common::String stpou;                               /* donne le % d'indices */
 byte is;
 char mode;
 fichier_byte ficdes;
-str125 al_mess,
+Common::String al_mess,
        err_mess,
        ind_mess,
        al_mess2;