From 34f9d3024549c1c9543a556ae423d88c1cc6bc7e Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 27 Dec 2011 23:27:37 +0000
Subject: MORTEVIELLE: COnvert more arrays and data types

---
 engines/mortevielle/actions.cpp |  4 ++--
 engines/mortevielle/menu.cpp    |  2 +-
 engines/mortevielle/mor.cpp     |  8 ++++----
 engines/mortevielle/mor2.cpp    |  8 ++++----
 engines/mortevielle/outtext.cpp | 10 +++++-----
 engines/mortevielle/outtext.h   |  6 +++---
 engines/mortevielle/ovd1.cpp    |  6 +++---
 engines/mortevielle/ques.cpp    |  2 +-
 engines/mortevielle/var_mor.h   | 32 +++++++++++++++-----------------
 9 files changed, 38 insertions(+), 40 deletions(-)

(limited to 'engines')

diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 4370947a09..25d9af0c24 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -476,7 +476,7 @@ L2:
 /* overlay */ void tmettre() {
 	int quel;
 	bool entre;
-	phrase st;
+	char st[1410];
 	Common::String str_;
 	int i, tay;
 
@@ -990,7 +990,7 @@ L2:
 	        i, tay, choi, x, y, c;
 	char tou;
 	array<1, 46, varying_string<40> > lib;
-	phrase st;
+	char st[1410];
 	bool f;
 
 
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index 82783277ce..d790bf25e8 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -182,7 +182,7 @@ void draw_menu() {
 }
 
 void invers(int ix) {
-	varying_string<23> s;
+	Common::String s;
 
 	/* debug('invers'); */
 	if (msg4 == no_choice)  return;
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index e55b4ed435..ea57e209ce 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -115,7 +115,7 @@ void text_color(int c) {
 
 
 void text1(int x, int y, int nb, int m) {
-	phrase st;
+	char st[1410];
 	int tay;
 	int co;
 
@@ -358,7 +358,7 @@ void okpas() {
 }
 
 void modobj(int m) {
-	phrase str_;
+	char str_[1410];
 	Common::String strp;
 	int i, tay;
 
@@ -373,7 +373,7 @@ void modobj(int m) {
 }
 
 void modobj2(int m, bool t1, bool t2) {
-	phrase str_;
+	char str_[1410];
 	Common::String strp;
 	int i, tay;
 
@@ -393,7 +393,7 @@ void modobj2(int m, bool t1, bool t2) {
 void repon(int f, int m) {
 	Common::String str_;
 	varying_string<40> str1;
-	phrase st;
+	char st[1410];
 	text1 fic;
 	int i, xco, dx, caspe, tay;
 
diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp
index dea21bde0a..7fc280aeae 100644
--- a/engines/mortevielle/mor2.cpp
+++ b/engines/mortevielle/mor2.cpp
@@ -199,7 +199,7 @@ void tkey1(bool d) {
 void tmlieu(int mli) {
 	int cx, j, i, tail;
 	Common::String nomp;
-	phrase st;
+	char st[1410];
 
 
 	if (mli == 26)  mli = 15;
@@ -230,7 +230,7 @@ void tlu(int af, int ob) {
 }
 
 void delin(int n) {
-	phrase s;
+	char s[1410];
 	int t;
 
 	deline(n, s, t);
@@ -342,7 +342,7 @@ void st1sama() {
 
 void modinv() {
 	int cx, cy, tay, i, r;
-	phrase nom;
+	char nom[1410];
 	Common::String nomp;
 
 	cy = 0;
@@ -366,7 +366,7 @@ void sparl(float adr, float rep) {
 	const array<1, 8, int> haut
 	= {{0, 1, -3, 6, -2, 2, 7, -1}};
 	int key, ad, tay, repint;
-	phrase st;
+	char st[1410];
 
 	repint = trunc(rep);
 	hide_mouse();
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index f474766ee4..1137f9001e 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -57,7 +57,7 @@ const byte tab31[32]= {
 	119,   0,   0,   0,   0,   0,   0,   0
 };
 
-void deline(int num , phrase &l , int &tl);
+void deline(int num , char *l , int &tl);
 
 static void cinq_huit(char &c, int &ind, byte &pt, bool &the_end) {
 	const unsigned char rap[32] = { 
@@ -114,7 +114,7 @@ static void cinq_huit(char &c, int &ind, byte &pt, bool &the_end) {
 	}
 }              /* 5-8 */
 
-void deline(int num , phrase &l , int &tl) {
+void deline(int num , char *l , int &tl) {
 	int i, j, ts;
 	char let;
 	byte ps, k;
@@ -141,10 +141,10 @@ void deline(int num , phrase &l , int &tl) {
 }       /* DETEX */
 
 
-void afftex(phrase ch, int x, int y, int dx, int dy, int typ);
+void afftex(char *ch, int x, int y, int dx, int dy, int typ);
 
 
-static int l_motsuiv(int p, phrase &ch, int &tab) {
+static int l_motsuiv(int p, char *ch, int &tab) {
 	int c;
 
 	int l_motsuiv_result;
@@ -154,7 +154,7 @@ static int l_motsuiv(int p, phrase &ch, int &tab) {
 	return l_motsuiv_result;
 }
 
-void afftex(phrase ch, int x, int y, int dx, int dy, int typ) {
+void afftex(char *ch, int x, int y, int dx, int dy, int typ) {
 	bool the_end;
 	char touch;
 	int xf, yf;
diff --git a/engines/mortevielle/outtext.h b/engines/mortevielle/outtext.h
index 27f9c6c617..14ef8c6c7e 100644
--- a/engines/mortevielle/outtext.h
+++ b/engines/mortevielle/outtext.h
@@ -33,9 +33,9 @@
 namespace Mortevielle {
 
 static void cinq_huit(char &c, int &ind, byte &pt, bool &the_end);
-void deline(int num , phrase &l , int &tl);
-static int l_motsuiv(int p, phrase &ch, int &tab);
-void afftex(phrase ch, int x, int y, int dx, int dy, int typ);
+void deline(int num , char *l , int &tl);
+static int l_motsuiv(int p, char *ch, int &tab);
+void afftex(char *ch, int x, int y, int dx, int dy, int typ);
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/ovd1.cpp b/engines/mortevielle/ovd1.cpp
index dbb0977c56..ab669e121a 100644
--- a/engines/mortevielle/ovd1.cpp
+++ b/engines/mortevielle/ovd1.cpp
@@ -80,7 +80,7 @@ void ani50() {
 
 /* overlay */ void init_menu() {
 	int i, j, tai;
-	phrase st;
+	char st[1410];
 	untyped_file f;
 
 	assign(f, "menufr.mor");
@@ -172,7 +172,7 @@ void ani50() {
 /* overlay */ void chartex() {
 	int i;
 	untyped_file fibyte;
-	phrase s;
+	char s[1410];
 
 	/* debug('o3 chartex'); */
 	i = 0;
@@ -202,7 +202,7 @@ void ani50() {
 
 {
 	int cy, tay;
-	phrase st;
+	char st[1410];
 	float ix;
 	char ch;
 
diff --git a/engines/mortevielle/ques.cpp b/engines/mortevielle/ques.cpp
index db44ce33ea..50490dfd27 100644
--- a/engines/mortevielle/ques.cpp
+++ b/engines/mortevielle/ques.cpp
@@ -39,7 +39,7 @@ namespace Mortevielle {
 	int i, j, k, y, memk;
 	int tay , tmax;
 	int rep, prem, der;
-	phrase st;
+	char st[1410];
 	char key;
 	mult_rect coor;
 	array<1, 14, Common::String> chaines;
diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h
index 42f95d5615..44a78e1529 100644
--- a/engines/mortevielle/var_mor.h
+++ b/engines/mortevielle/var_mor.h
@@ -166,22 +166,22 @@ const byte tnocon[364] = {
 };
 
 
-const matrix<1, 8, 1, 4, byte> don
-= {{{{ 7, 37, 22,  8}},
-		{{19, 33, 23,  7}},
-		{{31, 89, 10, 21}},
-		{{43, 25, 11,  5}},
-		{{55, 37,  5,  8}},
-		{{64, 13, 11,  2}},
-		{{62, 22, 13,  4}},
-		{{62, 25, 13,  5}}
-	}
+const byte don[9][5] = {
+	{ 0,  0,  0,  0, 0},
+	{ 0,  7, 37, 22,  8},
+	{0,  19, 33, 23,  7},
+	{0,  31, 89, 10, 21},
+	{0,  43, 25, 11,  5},
+	{0,  55, 37,  5,  8},
+	{0,  64, 13, 11,  2},
+	{0,  62, 22, 13,  4},
+	{0,  62, 25, 13,  5}
 };
 
-const array<1, 2, varying_string<11> > fic
-= {{ " Sauvegarde",
-		" Chargement"
-	}
+const char *fic[3] = {
+	"", 
+	" Sauvegarde",
+	 " Chargement"
 };
 
 const byte addv[2] = {8, 8};
@@ -201,7 +201,6 @@ const byte rang[16] = {15, 14, 11, 7, 13, 12, 10, 6, 9, 5, 3, 1, 2, 4, 8, 0};
 /*--------------------------------   TYPES   --------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-typedef file<byte> fichier_byte;
 struct sav_chaine {
 	int conf;
 	char pourc[11];
@@ -215,7 +214,7 @@ struct sav_chaine {
 struct registres {
 	int ax, bx, cx, dx, bp, si, di, ds, es, flags;
 };
-typedef char[1410] phrase;
+
 struct ind {
 	int indis;
 	byte point;
@@ -369,7 +368,6 @@ byte tabdon[4001];
 Common::String stpou;                               /* donne le % d'indices */
 byte is;
 char mode;
-fichier_byte ficdes;
 Common::String al_mess,
        err_mess,
        ind_mess,
-- 
cgit v1.2.3