diff options
author | Strangerke | 2011-12-26 23:56:30 +0100 |
---|---|---|
committer | Strangerke | 2012-04-06 08:18:34 +0200 |
commit | 2792e4069d404f12f5329e1ce4989158096af860 (patch) | |
tree | 9b9017298217d4e413e13391352e878ac7a975b3 /engines/mortevielle | |
parent | 6e171f7de12d078c7f6c6a64c63eeb1625e84a53 (diff) | |
download | scummvm-rg350-2792e4069d404f12f5329e1ce4989158096af860.tar.gz scummvm-rg350-2792e4069d404f12f5329e1ce4989158096af860.tar.bz2 scummvm-rg350-2792e4069d404f12f5329e1ce4989158096af860.zip |
MORTEVIELLE: use bool instead of boolean
Diffstat (limited to 'engines/mortevielle')
-rw-r--r-- | engines/mortevielle/actions.cpp | 6 | ||||
-rw-r--r-- | engines/mortevielle/alert.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/level15.cpp | 4 | ||||
-rw-r--r-- | engines/mortevielle/menu.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/mor.cpp | 8 | ||||
-rw-r--r-- | engines/mortevielle/mor.h | 2 | ||||
-rw-r--r-- | engines/mortevielle/mor2.cpp | 12 | ||||
-rw-r--r-- | engines/mortevielle/mor2.h | 2 | ||||
-rw-r--r-- | engines/mortevielle/mort.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/mouse.cpp | 10 | ||||
-rw-r--r-- | engines/mortevielle/mouse.h | 2 | ||||
-rw-r--r-- | engines/mortevielle/outtext.cpp | 4 | ||||
-rw-r--r-- | engines/mortevielle/outtext.h | 2 | ||||
-rw-r--r-- | engines/mortevielle/ovd1.cpp | 4 | ||||
-rw-r--r-- | engines/mortevielle/ovd1.h | 2 | ||||
-rw-r--r-- | engines/mortevielle/prog.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/ques.cpp | 6 | ||||
-rw-r--r-- | engines/mortevielle/var_mor.cpp | 6 |
18 files changed, 39 insertions, 39 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index 54f3972081..27598feea9 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -469,7 +469,7 @@ L2: /* overlay */ void tmettre() { int quel; - boolean entre; + bool entre; phrase st; Common::String str_; int i, tay; @@ -979,13 +979,13 @@ L2: /* overlay */ void tparler() { - array<1, 46, boolean> te; + array<1, 46, bool> te; 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; phrase st; - boolean f; + bool f; diff --git a/engines/mortevielle/alert.cpp b/engines/mortevielle/alert.cpp index 614271356c..1d5901bcd1 100644 --- a/engines/mortevielle/alert.cpp +++ b/engines/mortevielle/alert.cpp @@ -128,7 +128,7 @@ int do_alert(Common::String str_, int n) { char c, dumi; array<1, 2, varying_string<3> > s; int cx, cy, cd, nbcol, nblig; - boolean touch, newaff, test, test1, test2, test3, dum; + bool touch, newaff, test, test1, test2, test3, dum; Common::String cas; diff --git a/engines/mortevielle/level15.cpp b/engines/mortevielle/level15.cpp index c7a8344230..6f5f001d74 100644 --- a/engines/mortevielle/level15.cpp +++ b/engines/mortevielle/level15.cpp @@ -40,10 +40,10 @@ void copcha() { } while (!(i == acha + 390)); } -boolean dans_rect(rectangle r) { +bool dans_rect(rectangle r) { int x, y, c; - boolean dans_rect_result; + bool dans_rect_result; read_pos_mouse(x, y, c); if ((x > r.x1) && (x < r.x2) && diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp index f91eda12ee..82783277ce 100644 --- a/engines/mortevielle/menu.cpp +++ b/engines/mortevielle/menu.cpp @@ -311,7 +311,7 @@ void erase_menu() { void mdn() { int x, y, c, a, ix; - boolean tes; + bool tes; /* debug('mdn'); */ if (! active_menu) return; diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp index bf417dbf7e..5b8058898d 100644 --- a/engines/mortevielle/mor.cpp +++ b/engines/mortevielle/mor.cpp @@ -369,7 +369,7 @@ void modobj(int m) { menu_disable(invt[8]); } -void modobj2(int m, boolean t1, boolean t2) { +void modobj2(int m, bool t1, bool t2) { phrase str_; Common::String strp; int i, tay; @@ -526,7 +526,7 @@ void affper(int per) { } /* overlay */ void choix(int min, int max, int &per) { - boolean i; + bool i; int haz, cx, cy, cz; long_int per2, cz2; @@ -841,7 +841,7 @@ void debloc(int l) { /* overlay */ void quelq15(int &per) { int cx; - boolean test; + bool test; /* debug('o1 quelq15'); */ @@ -1254,7 +1254,7 @@ void aniof(int ouf, int num) { } void musique(int so) { - boolean i; + bool i; int haz; /* dep: array[1..5] of long_int;*/ diff --git a/engines/mortevielle/mor.h b/engines/mortevielle/mor.h index 1211d215ae..82f8004400 100644 --- a/engines/mortevielle/mor.h +++ b/engines/mortevielle/mor.h @@ -58,7 +58,7 @@ void conv(int x, int &y); /* NIVEAU 12 */ void okpas(); void modobj(int m); -void modobj2(int m, boolean t1, boolean t2); +void modobj2(int m, bool t1, bool t2); void repon(int f, int m); void f3f8(); void t5(int cx); diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp index 69637761d2..45146c1bce 100644 --- a/engines/mortevielle/mor2.cpp +++ b/engines/mortevielle/mor2.cpp @@ -178,8 +178,8 @@ void afdes(int ad) { okdes = false; } -void tkey1(boolean d) { - boolean quest; +void tkey1(bool d) { + bool quest; int x, y, c; int key; @@ -327,7 +327,7 @@ void st4(int ob) { } } -void cherjer(int ob, boolean &d) { +void cherjer(int ob, bool &d) { int cx; d = false; @@ -455,7 +455,7 @@ void ajjer(int ob) { void t1sama() { /* On entre dans le manoir */ int j, h, m; - boolean d; + bool d; calch(j, h, m); if ((h < 5) && (s.mlieu > 18)) { @@ -601,7 +601,7 @@ void tsuiv() { } void tfleche() { - boolean qust; + bool qust; char touch; int dummy, cd, xmo, ymo; @@ -728,7 +728,7 @@ void rechai(int &ch) { } void t23coul(int &l) { - boolean d; + bool d; cherjer(143, d); l = 14; diff --git a/engines/mortevielle/mor2.h b/engines/mortevielle/mor2.h index bad43320c5..46181c5e9a 100644 --- a/engines/mortevielle/mor2.h +++ b/engines/mortevielle/mor2.h @@ -46,7 +46,7 @@ void atf3f8(int &key); void tperd(); void tsort(); void st4(int ob); -void cherjer(int ob, boolean &d); +void cherjer(int ob, bool &d); void st1sama(); void modinv(); void sparl(long_int adr, long_int rep); diff --git a/engines/mortevielle/mort.cpp b/engines/mortevielle/mort.cpp index 2d4f127b09..2555b83232 100644 --- a/engines/mortevielle/mort.cpp +++ b/engines/mortevielle/mort.cpp @@ -53,7 +53,7 @@ namespace Mortevielle { -void divers(int np, boolean b) { +void divers(int np, bool b) { teskbd(); do { parole(np, 0, 0); diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp index e894e086af..8b4fcaa84a 100644 --- a/engines/mortevielle/mouse.cpp +++ b/engines/mortevielle/mouse.cpp @@ -32,7 +32,7 @@ namespace Mortevielle { const int m_arrow = 0; const int m_point_hand = 1; -boolean int_m, +bool int_m, clic; int m_show, @@ -88,7 +88,7 @@ end; */ void hide_mouse() { int i, j, k, ps, ds; - boolean imp; + bool imp; mouse_shwn = pred(int, mouse_shwn); if (mouse_shwn == 0) { @@ -177,7 +177,7 @@ void hide_mouse() { void show_mouse() { int i, j, k, l, ps, ds; - boolean imp; + bool imp; char c; mouse_shwn = mouse_shwn + 1; @@ -311,8 +311,8 @@ void read_pos_mouse(int &x, int &y, int &c) { } } -void mov_mouse(boolean &funct, char &key) { - boolean p_key; +void mov_mouse(bool &funct, char &key) { + bool p_key; char in1, in2; int x, y, cx, cy, cd; registres reg; diff --git a/engines/mortevielle/mouse.h b/engines/mortevielle/mouse.h index 62fdf1bfe4..90fe91e373 100644 --- a/engines/mortevielle/mouse.h +++ b/engines/mortevielle/mouse.h @@ -37,7 +37,7 @@ void hide_mouse(); void show_mouse(); void pos_mouse(int x, int y); void read_pos_mouse(int &x, int &y, int &c); -void mov_mouse(boolean &funct, char &key); +void mov_mouse(bool &funct, char &key); } // End of namespace Mortevielle #endif diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp index 072fe5cea1..749bc13d1c 100644 --- a/engines/mortevielle/outtext.cpp +++ b/engines/mortevielle/outtext.cpp @@ -57,7 +57,7 @@ const byte tab31[32]= { void deline(int num , phrase &l , int &tl); -static void cinq_huit(char &c, int &ind, byte &pt, boolean &the_end) { +static void cinq_huit(char &c, int &ind, byte &pt, bool &the_end) { const unsigned char rap[32] = { ',', ':', '@', '!', '?', '-', '\207', '\240', '\205', '\203', '\202', '\212', '\210', '/', @@ -153,7 +153,7 @@ static int l_motsuiv(int p, phrase &ch, int &tab) { } void afftex(phrase ch, int x, int y, int dx, int dy, int typ) { - boolean the_end; + bool the_end; char touch; int xf, yf; int xc, yc; diff --git a/engines/mortevielle/outtext.h b/engines/mortevielle/outtext.h index fcf4822ab5..b9a239bff6 100644 --- a/engines/mortevielle/outtext.h +++ b/engines/mortevielle/outtext.h @@ -30,7 +30,7 @@ namespace Mortevielle { -static void cinq_huit(char &c, int &ind, byte &pt, boolean &the_end); +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); diff --git a/engines/mortevielle/ovd1.cpp b/engines/mortevielle/ovd1.cpp index d18af48e96..570d548887 100644 --- a/engines/mortevielle/ovd1.cpp +++ b/engines/mortevielle/ovd1.cpp @@ -65,7 +65,7 @@ void ani50() { end; end;*/ -/* overlay */ void aff50(boolean c) { +/* overlay */ void aff50(bool c) { int k; caff = 50; @@ -276,7 +276,7 @@ void ani50() { /* overlay */ void music() { untyped_file fic; int k; - boolean fin; + bool fin; char ch; float x, y; diff --git a/engines/mortevielle/ovd1.h b/engines/mortevielle/ovd1.h index 339ee69f9f..4cad37c0ab 100644 --- a/engines/mortevielle/ovd1.h +++ b/engines/mortevielle/ovd1.h @@ -33,7 +33,7 @@ namespace Mortevielle { void dem2(); void ani50(); //void apzuul(); -void aff50(boolean c); +void aff50(bool c); void init_menu(); void charpal(); void chartex(); diff --git a/engines/mortevielle/prog.cpp b/engines/mortevielle/prog.cpp index 9ff2b665c3..ddf9e4d36b 100644 --- a/engines/mortevielle/prog.cpp +++ b/engines/mortevielle/prog.cpp @@ -243,7 +243,7 @@ void tecran() { const int lim = 20000; int temps; char inkey; - boolean oo, funct; + bool oo, funct; clsf3(); oo = false; diff --git a/engines/mortevielle/ques.cpp b/engines/mortevielle/ques.cpp index 4080453083..a802516795 100644 --- a/engines/mortevielle/ques.cpp +++ b/engines/mortevielle/ques.cpp @@ -30,7 +30,7 @@ namespace Mortevielle { -/* overlay */ boolean ques() { +/* overlay */ bool ques() { const array<1, 10, int> ta = {{ 511, 516, 524, 531, 545, @@ -40,7 +40,7 @@ namespace Mortevielle { const array<1, 10, int> ok = {{ 4, 7, 1, 6, 4, 4, 2, 5, 3, 1 }}; - boolean q, func, test; + bool q, func, test; int i, j, k, y, memk; int tay , tmax; int rep, prem, der; @@ -51,7 +51,7 @@ namespace Mortevielle { int compte; - boolean ques_result; + bool ques_result; test = false; i = 0; compte = 0; diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp index c2ce4b3a75..2f9928738d 100644 --- a/engines/mortevielle/var_mor.cpp +++ b/engines/mortevielle/var_mor.cpp @@ -208,7 +208,7 @@ struct sav_chaine { char sjer[31]; int mlieu, iboul, ibag, icave, ivier, ipuit; int derobj, iloic, icryp; - boolean ipre; + bool ipre; char heure; }; struct registres { @@ -238,7 +238,7 @@ struct doublet { typedef array<1, 16, doublet> tabdb; struct rectangle { int x1, x2, y1, y2; - boolean etat; + bool etat; }; typedef array<1, max_rect, rectangle> mult_rect; @@ -263,7 +263,7 @@ struct t_pcga { /*------------------------------ VARIABLES ------------------------------*/ /*---------------------------------------------------------------------------*/ -boolean blo, +bool blo, bh1, bf1, bh2, |