diff options
author | Paul Gilbert | 2011-12-30 21:34:33 +1100 |
---|---|---|
committer | Strangerke | 2012-04-06 08:18:45 +0200 |
commit | 98ea43b7c58bf8c5dbc113dcdb8cc78366a167ba (patch) | |
tree | 5f59be999961c976b161070ddfeb73854ea5f6b5 /engines | |
parent | 38b1cc473988db5f7f95e1a1c464844052171ca9 (diff) | |
download | scummvm-rg350-98ea43b7c58bf8c5dbc113dcdb8cc78366a167ba.tar.gz scummvm-rg350-98ea43b7c58bf8c5dbc113dcdb8cc78366a167ba.tar.bz2 scummvm-rg350-98ea43b7c58bf8c5dbc113dcdb8cc78366a167ba.zip |
MORTEVIELLE: Converted remaining varying_string instances to Common::String
Diffstat (limited to 'engines')
-rw-r--r-- | engines/mortevielle/actions.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/alert.cpp | 4 | ||||
-rw-r--r-- | engines/mortevielle/disk.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/mor.cpp | 4 | ||||
-rw-r--r-- | engines/mortevielle/mor2.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/outtext.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/ovd1.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/ques.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index 25d9af0c24..ab3481d2e3 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -989,7 +989,7 @@ L2: int ix, cy, cx, max, haz, suj, co, lig, icm, i, tay, choi, x, y, c; char tou; - array<1, 46, varying_string<40> > lib; + Common::String lib[47]; char st[1410]; bool f; diff --git a/engines/mortevielle/alert.cpp b/engines/mortevielle/alert.cpp index 1d5901bcd1..ec7c5f0721 100644 --- a/engines/mortevielle/alert.cpp +++ b/engines/mortevielle/alert.cpp @@ -100,7 +100,7 @@ static void fait_boite(int lidep, int nli, int tx) { -static void fait_choix(Common::String 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, Common::String[] &s, int &esp) { int i, l, x; char ch; @@ -126,7 +126,7 @@ int do_alert(Common::String str_, int n) { Common::String st, chaine; matrix<1, 2, 1, 2, int> limit; char c, dumi; - array<1, 2, varying_string<3> > s; + Common::String s[3]; int cx, cy, cd, nbcol, nblig; bool touch, newaff, test, test1, test2, test3, dum; Common::String cas; diff --git a/engines/mortevielle/disk.cpp b/engines/mortevielle/disk.cpp index a18bdd8a6f..89d01c59c9 100644 --- a/engines/mortevielle/disk.cpp +++ b/engines/mortevielle/disk.cpp @@ -50,7 +50,7 @@ void dem1() { void takesav(int n) { untyped_file f; int i; - varying_string<10> st; + Common::String st; dem1(); /* -- chargement du fichier 'sauve#n.mor' -- */ diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp index ea57e209ce..083187ea9d 100644 --- a/engines/mortevielle/mor.cpp +++ b/engines/mortevielle/mor.cpp @@ -268,7 +268,7 @@ void ecrf7() { void clsf10() { int co, cod; - varying_string<8> st; + Common::String st; /* debug('clsf10'); */ hide_mouse(); @@ -392,7 +392,7 @@ void modobj2(int m, bool t1, bool t2) { void repon(int f, int m) { Common::String str_; - varying_string<40> str1; + Common::String str1; char st[1410]; text1 fic; int i, xco, dx, caspe, tay; diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp index 7fc280aeae..d41f480246 100644 --- a/engines/mortevielle/mor2.cpp +++ b/engines/mortevielle/mor2.cpp @@ -46,7 +46,7 @@ void tinke() { const char d5 = '1'; const char d6[] = "OK"; int cx, cy, haz, nh, cf, j, h, m, cd; - varying_string<3> stpo; + Common::String stpo; bool am; anyone = false; diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp index 1137f9001e..84149699fd 100644 --- a/engines/mortevielle/outtext.cpp +++ b/engines/mortevielle/outtext.cpp @@ -160,7 +160,7 @@ void afftex(char *ch, int x, int y, int dx, int dy, int typ) { int xf, yf; int xc, yc; int tab, p; - varying_string<255> s; + Common::String s; int i, j, nt; diff --git a/engines/mortevielle/ovd1.cpp b/engines/mortevielle/ovd1.cpp index ab669e121a..5198d7f6e8 100644 --- a/engines/mortevielle/ovd1.cpp +++ b/engines/mortevielle/ovd1.cpp @@ -348,7 +348,7 @@ void ani50() { /* overlay */ void suite() { - varying_string<25> cpr; + Common::String cpr; hirs(); repon(7, 2035); diff --git a/engines/mortevielle/ques.cpp b/engines/mortevielle/ques.cpp index d52d89e53e..870f8b7435 100644 --- a/engines/mortevielle/ques.cpp +++ b/engines/mortevielle/ques.cpp @@ -42,7 +42,7 @@ namespace Mortevielle { char st[1410]; char key; rectangle coor[max_rect]; - array<1, 14, Common::String> chaines; + Common::String chaines[15]; int compte; |