From 56d8f2b39c380213e848bb9efc08f4bfa69a3880 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 26 Dec 2011 17:57:54 +0000 Subject: MORTEVIELLE: integer -> int --- engines/mortevielle/actions.cpp | 56 ++++----- engines/mortevielle/alert.cpp | 38 +++--- engines/mortevielle/boite.cpp | 18 +-- engines/mortevielle/disk.cpp | 12 +- engines/mortevielle/droite.cpp | 6 +- engines/mortevielle/keyboard.cpp | 10 +- engines/mortevielle/level15.cpp | 46 +++---- engines/mortevielle/menu.cpp | 34 ++--- engines/mortevielle/mor.cpp | 260 +++++++++++++++++++-------------------- engines/mortevielle/mor2.cpp | 102 +++++++-------- engines/mortevielle/mort.cpp | 2 +- engines/mortevielle/mouse.cpp | 52 ++++---- engines/mortevielle/outtext.cpp | 28 ++--- engines/mortevielle/ovd1.cpp | 18 +-- engines/mortevielle/parole.cpp | 16 +-- engines/mortevielle/parole2.cpp | 12 +- engines/mortevielle/prog.cpp | 26 ++-- engines/mortevielle/ques.cpp | 14 +-- engines/mortevielle/sprint.cpp | 14 +-- engines/mortevielle/taffich.cpp | 18 +-- engines/mortevielle/var_mor.cpp | 240 ++++++++++++++++++------------------ 21 files changed, 511 insertions(+), 511 deletions(-) (limited to 'engines') diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index 1dd3abe08f..83ad8d4f6b 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -5,7 +5,7 @@ const char stouinon[] = "[2][ ][OUI][NON]"; void taller() { - integer mx, cx, cy; + int mx, cx, cy; if ((s.mlieu == 26) && (msg[4] == depl[6])) { s.mlieu = 15; @@ -94,7 +94,7 @@ L2: } /* overlay */ void tprendre() { - integer cx, cy, cz; + int cx, cy, cz; if (caff > 99) { cx = caff; @@ -115,7 +115,7 @@ L2: obpart = false; affrep(); } else { - tabdon[acha + (pred(integer, mchai) * 10) + pred(integer, cs)] = 0; + tabdon[acha + (pred(int, mchai) * 10) + pred(int, cs)] = 0; tsuiv(); dobj = dobj + 1; if (dobj > 6) { @@ -188,7 +188,7 @@ L2: } /* overlay */ void tsprendre() { - integer cx, cy, cz; + int cx, cy, cz; cx = 0; do { @@ -211,7 +211,7 @@ L2: /* overlay */ void tsoulever() { - integer cx; + int cx; if (! syn) ecr3("soulever"); tfleche(); @@ -230,12 +230,12 @@ L2: cx = s.mlieu; if (s.mlieu == 16) cx = 14; if (s.mlieu == 19) cx = 15; - crep = tabdon[asoul + (cx << 3) + pred(integer, num)]; + crep = tabdon[asoul + (cx << 3) + pred(int, num)]; if (crep == 255) crep = 997; } /* overlay */ void tlire() { - integer iaff; + int iaff; if (caff > 99) st4(caff); else { @@ -254,7 +254,7 @@ L2: } /* overlay */ void tregarder() { - integer cx; + int cx; if (caff > 99) { crep = 103; @@ -297,7 +297,7 @@ L2: if (s.mlieu == 20) cx = 17; if ((s.mlieu > 21) && (s.mlieu < 25)) cx = cx - 4; if (s.mlieu == 26) cx = 21; - crep = tabdon[arega + (cx * 7) + pred(integer, num)]; + crep = tabdon[arega + (cx * 7) + pred(int, num)]; if ((s.mlieu == 13) && (num == 8)) crep = 126; if (s.mlieu == 19) crep = 103; if (crep == 255) crep = 131; @@ -315,7 +315,7 @@ L2: /* overlay */ void tfouiller() { const array<0, 13, byte> r = {{123, 104, 123, 131, 131, 123, 104, 131, 123, 123, 106, 123, 123, 107}}; - integer cx; + int cx; if (caff > 99) { st7(caff); @@ -386,7 +386,7 @@ L2: } /* overlay */ void touvrir() { - integer cx, haz; + int cx, haz; if (! syn) ecr3("ouvrir"); if (caff == 26) { @@ -432,18 +432,18 @@ L2: } cx = s.mlieu; if (s.mlieu == 16) cx = 14; - crep = tabdon[aouvr + (cx * 7) + pred(integer, num)]; + crep = tabdon[aouvr + (cx * 7) + pred(int, num)]; if (crep == 254) crep = 999; } else crep = 18; } } /* overlay */ void tmettre() { - integer quel; + int quel; boolean entre; phrase st; str255 str_; - integer i, tay; + int i, tay; if (s.derobj == 0) { crep = 186; @@ -542,7 +542,7 @@ L2: } /* overlay */ void ttourner() { - integer quel; + int quel; if (caff > 99) { crep = 149; @@ -608,7 +608,7 @@ L2: } /* overlay */ void tfermer() { - integer cx, chai; + int cx, chai; if (! syn) ecr3("fermer"); if (caff < 26) { @@ -637,7 +637,7 @@ L2: } /* overlay */ void tfrapper() { - integer l, p, haz; + int l, p, haz; if (! syn) ecr3("frapper"); if (s.mlieu == 15) { @@ -669,7 +669,7 @@ L2: } /* overlay */ void tposer() { - integer cx, chai; + int cx, chai; if (! syn) ecr3("poser"); if (s.derobj == 0) crep = 186; @@ -734,7 +734,7 @@ L2: } /* overlay */ void tecouter() { - integer l, p, haz, j, h, m; + int l, p, haz, j, h, m; if (s.mlieu != 26) crep = 101; else { @@ -759,7 +759,7 @@ L2: } /* overlay */ void tmanger() { - integer j, h, m; + int j, h, m; if ((s.mlieu > 15) && (s.mlieu < 26)) crep = 148; @@ -786,7 +786,7 @@ L2: } /* overlay */ void tentrer() { - integer x, z; + int x, z; if ((s.mlieu == 21) || (s.mlieu == 22)) { t1sama(); @@ -840,7 +840,7 @@ L2: /* overlay */ void tdormir() { const char m1[] = "D‚sirez-vous vous r‚veiller?"; - integer z, j, h, m, quel; + int z, j, h, m, quel; if ((s.mlieu > 15) && (s.mlieu < 26)) { crep = 148; @@ -890,7 +890,7 @@ L2: } /* overlay */ void tsortir() { - integer lx; + int lx; tsort(); crep = 0; @@ -915,7 +915,7 @@ L2: } /* overlay */ void tattendre() { - integer quel; + int quel; mpers = 0; clsf3(); @@ -951,7 +951,7 @@ L2: { array<1, 46, boolean> te; - integer ix, cy, cx, max, haz, suj, co, lig, icm, + 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; @@ -994,7 +994,7 @@ L2: co = 0; lig = 0; do { - icm = succ(integer, icm); + icm = succ(int, icm); putxy(co, lig); if (s.teauto[icm] == '*') if (te[icm]) writetp(lib[icm], 1); @@ -1014,7 +1014,7 @@ L2: x = x * (3 - res); if (x > 319) cx = 41; else cx = 1; - cy = succ(integer, (cardinal)y >> 3); /* 0-199 => 1-25 */ + cy = succ(int, (cardinal)y >> 3); /* 0-199 => 1-25 */ if ((cy > 23) || ((cx == 41) && (set::of(range(20, 22), eos).has(cy)))) { if (choi != 0) { lig = ((choi - 1) % 23) << 3; @@ -1173,7 +1173,7 @@ L2: } /* overlay */ void tencore() { /* Perdu !!! */ - integer quel; + int quel; clsf2(); musique(0); diff --git a/engines/mortevielle/alert.cpp b/engines/mortevielle/alert.cpp index d059fc3ef3..cec339e29a 100644 --- a/engines/mortevielle/alert.cpp +++ b/engines/mortevielle/alert.cpp @@ -1,8 +1,8 @@ -/* overlay */ integer do_alert(str255 str_, integer n); +/* overlay */ int do_alert(str255 str_, int n); -const integer nligne = 7; -const matrix<1, 2, 1, 3, integer> coord +const int nligne = 7; +const matrix<1, 2, 1, 3, int> coord = {{ {{150, 72, 103}}, {{143, 107, 183}} } @@ -10,8 +10,8 @@ const matrix<1, 2, 1, 3, integer> coord -static void decod(str255 s, integer &nbc, integer &nbl, integer &col, str255 &c, str30 &cs) { - integer i, k; +static void decod(str255 s, int &nbc, int &nbl, int &col, str255 &c, str30 &cs) { + int i, k; boolean v; val(s[2], nbc, i); @@ -47,18 +47,18 @@ static void decod(str255 s, integer &nbc, integer &nbl, integer &col, str255 &c, -static void posit(integer ji, integer &coldep, integer &esp) { - putxy(coldep + (40 + esp) *pred(integer, ji), 98); +static void posit(int ji, int &coldep, int &esp) { + putxy(coldep + (40 + esp) *pred(int, ji), 98); } -static void fait_boite(integer lidep, integer nli, integer tx) { - integer x, y, xx, yy; +static void fait_boite(int lidep, int nli, int tx) { + int x, y, xx, yy; if (tx > 640) tx = 640; x = 320 - ((cardinal)tx >> 1); - y = pred(integer, lidep) << 3; + y = pred(int, lidep) << 3; xx = x + tx; yy = y + (nli << 3); box(15, gd, x, y, xx, yy, 255); @@ -68,8 +68,8 @@ static void fait_boite(integer lidep, integer nli, integer tx) { -static void fait_choix(str30 c, integer &coldep, integer &nbcase, array<1, 2, varying_string<3> > &s, integer &esp) { - integer i, l, x; +static void fait_choix(str30 c, int &coldep, int &nbcase, array<1, 2, varying_string<3> > &s, int &esp) { + int i, l, x; char ch; i = 1; @@ -89,24 +89,24 @@ static void fait_choix(str30 c, integer &coldep, integer &nbcase, array<1, 2, va } } -integer do_alert(str255 str_, integer n) { - integer coldep, esp, i, l, nbcase, quoi, ix; +int do_alert(str255 str_, int n) { + int coldep, esp, i, l, nbcase, quoi, ix; str255 st, chaine; - matrix<1, 2, 1, 2, integer> limit; + matrix<1, 2, 1, 2, int> limit; char c, dumi; array<1, 2, varying_string<3> > s; - integer cx, cy, cd, nbcol, nblig; + int cx, cy, cd, nbcol, nblig; boolean touch, newaff, test, test1, test2, test3, dum; str30 cas; /*debug('** do_alert **');*/ - integer do_alert_result; + int do_alert_result; hide_mouse(); while (keypressed()) input >> kbd >> dumi; clic = false; decod(str_, nbcase, nblig, nbcol, chaine, cas); - sauvecr(50, succ(integer, nligne) << 4); + sauvecr(50, succ(int, nligne) << 4); i = 0; if (chaine == "") { @@ -190,7 +190,7 @@ integer do_alert(str255 str_, integer n) { posit(n, coldep, esp); writeg(string(' ') + s[n] + ' ', 1); } - charecr(50, succ(integer, nligne) << 4); + charecr(50, succ(int, nligne) << 4); show_mouse(); do_alert_result = quoi; return do_alert_result; diff --git a/engines/mortevielle/boite.cpp b/engines/mortevielle/boite.cpp index 4120f7337f..d1ebe4da38 100644 --- a/engines/mortevielle/boite.cpp +++ b/engines/mortevielle/boite.cpp @@ -1,6 +1,6 @@ -void boite(integer x, integer y, integer dx, integer dy, integer coul) { - integer i; - integer xi, yi, xo, yo; +void boite(int x, int y, int dx, int dy, int coul) { + int i; + int xi, yi, xo, yo; /* debug('boite'); */ hide_mouse(); @@ -15,14 +15,14 @@ void boite(integer x, integer y, integer dx, integer dy, integer coul) { for (i = 0; i <= dx + dy; i ++) { putpix(gd, xi, yi, coul); if (xi == x + dx) { - if (gd != cga) putpix(gd, pred(integer, xi), yi, coul); - yi = succ(integer, yi); - } else xi = succ(integer, xi); + if (gd != cga) putpix(gd, pred(int, xi), yi, coul); + yi = succ(int, yi); + } else xi = succ(int, xi); putpix(gd, xo, yo, coul); - if (yo == y + dy) xo = succ(integer, xo); + if (yo == y + dy) xo = succ(int, xo); else { - if (gd != cga) putpix(gd, succ(integer, xo), yo, coul); - yo = succ(integer, yo); + if (gd != cga) putpix(gd, succ(int, xo), yo, coul); + yo = succ(int, yo); } } show_mouse(); diff --git a/engines/mortevielle/disk.cpp b/engines/mortevielle/disk.cpp index 517d408c87..0e458a5033 100644 --- a/engines/mortevielle/disk.cpp +++ b/engines/mortevielle/disk.cpp @@ -1,7 +1,7 @@ void dem1() { untyped_file f; - integer k; + int k; /* -- demande de disk 1 -- */ assign(f, "mort.005"); @@ -17,9 +17,9 @@ void dem1() { close(f); } -void takesav(integer n) { +void takesav(int n) { untyped_file f; - integer i; + int i; varying_string<10> st; dem1(); @@ -37,7 +37,7 @@ void takesav(integer n) { close(f); } -void ld_game(integer n) { +void ld_game(int n) { hide_mouse(); maivid(); takesav(n); @@ -50,9 +50,9 @@ void ld_game(integer n) { show_mouse(); } -void sv_game(integer n) { +void sv_game(int n) { untyped_file f; - integer i; + int i; hide_mouse(); tmaj3(); diff --git a/engines/mortevielle/droite.cpp b/engines/mortevielle/droite.cpp index 8d254a4afc..0ad212dec1 100644 --- a/engines/mortevielle/droite.cpp +++ b/engines/mortevielle/droite.cpp @@ -1,5 +1,5 @@ -void droite(integer x, integer y, integer xx, integer yy, integer coul) { - integer step, i; +void droite(int x, int y, int xx, int yy, int coul) { + int step, i; real a, b; real xr, yr, xro, yro; @@ -31,4 +31,4 @@ void droite(integer x, integer y, integer xx, integer yy, integer coul) { } while (!(i == xx)); /*writeln(le_file,'Y == ',a:3:3,' * X + ',b:3:3);*/ } -} \ No newline at end of file +} diff --git a/engines/mortevielle/keyboard.cpp b/engines/mortevielle/keyboard.cpp index b450e074c1..199d43862f 100644 --- a/engines/mortevielle/keyboard.cpp +++ b/engines/mortevielle/keyboard.cpp @@ -7,10 +7,10 @@ char readkey1() { return readkey1_result; } -integer testou() { +int testou() { char ch; - integer testou_result; + int testou_result; input >> kbd >> ch; switch (ch) { case '\23' : @@ -19,7 +19,7 @@ integer testou() { case '\1': case '\3': case '\5' : { - newgd = (cardinal)pred(integer, ord(ch)) >> 1; + newgd = (cardinal)pred(int, ord(ch)) >> 1; testou_result = 61; return testou_result; } @@ -39,7 +39,7 @@ integer testou() { case '\26' : if (set::of(1, 2, eos).has(c_zzz)) { zzuul(adcfiec + 161, 0, 1644); - c_zzz = succ(integer, c_zzz); + c_zzz = succ(int, c_zzz); testou_result = 61; return testou_result; } @@ -53,7 +53,7 @@ integer testou() { } void teskbd() { - integer dum; + int dum; if (keypressed()) dum = testou(); } diff --git a/engines/mortevielle/level15.cpp b/engines/mortevielle/level15.cpp index 2c9b8cdcf4..35de7f439f 100644 --- a/engines/mortevielle/level15.cpp +++ b/engines/mortevielle/level15.cpp @@ -1,17 +1,17 @@ /* NIVEAU 15 */ void copcha() { - integer i; + int i; i = acha; do { tabdon[i] = tabdon[i + 390]; - i = succ(integer, i); + i = succ(int, i); } while (!(i == acha + 390)); } boolean dans_rect(rectangle r) { - integer x, y, c; + int x, y, c; boolean dans_rect_result; read_pos_mouse(x, y, c); @@ -23,8 +23,8 @@ boolean dans_rect(rectangle r) { return dans_rect_result; } -void outbloc(integer n, pattern p, t_nhom pal) { - integer i, j, ad; +void outbloc(int n, pattern p, t_nhom pal) { + int i, j, ad; ad = n * 404 + 0xd700; { @@ -33,13 +33,13 @@ void outbloc(integer n, pattern p, t_nhom pal) { ad = ad + 4; for (i = 1; i <= p.tax; i ++) for (j = 1; j <= p.tay; j ++) - mem[0x6000 + ad + pred(integer, j)*p.tax + pred(integer, i)] = pal[n].hom[p.des[i][j]]; + mem[0x6000 + ad + pred(int, j)*p.tax + pred(int, i)] = pal[n].hom[p.des[i][j]]; } } -void writepal(integer n) { - integer i; +void writepal(int n) { + int i; t_nhom pal; @@ -49,7 +49,7 @@ void writepal(integer n) { case ams : for (i = 1; i <= 16; i ++) { mem[0x7000 + 2 * i] = tabpal[n][i].x; - mem[0x7000 + succ(integer, 2 * i)] = tabpal[n][i].y; + mem[0x7000 + succ(int, 2 * i)] = tabpal[n][i].y; } break; case cga : { @@ -62,7 +62,7 @@ void writepal(integer n) { } -void pictout(integer seg, integer dep, integer x, integer y) { +void pictout(int seg, int dep, int x, int y) { decomp(seg, dep); if (gd == her) { mem[0x7000 + 2] = 0; @@ -72,45 +72,45 @@ void pictout(integer seg, integer dep, integer x, integer y) { afff(gd, seg, dep, x, y); } -void putxy(integer x, integer y) { +void putxy(int x, int y) { xwhere = x; ywhere = y; } /* -function calad(x,y:integer):integer; +function calad(x,y:int):int; begin calad:=pred(x)+320*pred(y) end; */ -void sauvecr(integer y, integer dy) { +void sauvecr(int y, int dy) { hide_mouse(); s_sauv(gd, y, dy); show_mouse(); } -void charecr(integer y, integer dy) { +void charecr(int y, int dy) { hide_mouse(); s_char(gd, y, dy); show_mouse(); } /* -function peek(ad:integer):integer; +function peek(ad:int):int; begin peek:=tabdon[ad]; end; -function peekw(ad:integer):integer; +function peekw(ad:int):int; begin peekw:=tabdon[ad] shl 8+tabdon[succ(ad)]; end; -function peekl(ad:integer):real; +function peekl(ad:int):real; begin peekl:=tabdon[ad+3]+tabdon[ad+2] shl 8; end; -procedure poke (ad,n:integer); +procedure poke (ad,n:int); begin tabdon[ad]:=lo(n); end; @@ -120,7 +120,7 @@ void adzon() { untyped_file f; file g; byte a; - integer i; + int i; assign(f, "don.mor"); reset(f, 256); @@ -148,10 +148,10 @@ void adzon() { close(f); } -integer animof(integer ouf, integer num) { - integer nani, aux; +int animof(int ouf, int num) { + int nani, aux; - integer animof_result; + int animof_result; nani = mem[adani + 1]; aux = num; if (ouf != 1) aux = aux + nani; @@ -163,7 +163,7 @@ integer animof(integer ouf, integer num) { return animof_result; } -/*procedure affgd(offs,dep,x,y:integer); +/*procedure affgd(offs,dep,x,y:int); begin case Gd of Ams : affams(offs,dep,x,y); diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp index 691ef7c852..9018414d28 100644 --- a/engines/mortevielle/menu.cpp +++ b/engines/mortevielle/menu.cpp @@ -1,6 +1,6 @@ /* NIVEAU 14*/ -/* overlay */ void menut(integer no, str30 nom) { +/* overlay */ void menut(int no, str30 nom) { byte h, l; str30 s; @@ -33,7 +33,7 @@ } } -/* overlay */ void menu_disable(integer no) { +/* overlay */ void menu_disable(int no) { byte h, l; /* debug('menu_disable'); */ @@ -62,7 +62,7 @@ } } -/* overlay */ void menu_enable(integer no) { +/* overlay */ void menu_enable(int no) { byte h, l; /* debug('menu_disable'); */ @@ -92,9 +92,9 @@ } void menu_aff() { - integer ind_tabl, k, col; + int ind_tabl, k, col; char c; - integer pt, x, y, color, msk, + int pt, x, y, color, msk, num_letr; /* debug('menu_aff'); */ @@ -127,8 +127,8 @@ void menu_aff() { msk = (cardinal)msk >> 1; x = x + 1; } - ind_tabl = succ(integer, ind_tabl); - k = succ(integer, k); + ind_tabl = succ(int, ind_tabl); + k = succ(int, k); } while (!(k == 3)); y = y + 1; } while (!(y == 9)); @@ -149,7 +149,7 @@ void draw_menu() { test0 = false; } -void invers(integer ix) { +void invers(int ix) { varying_string<23> s; /* debug('invers'); */ @@ -186,8 +186,8 @@ void invers(integer ix) { else msg4 = no_choice; } -void util(integer x, integer y) { - integer ymx, dxcar, xmn, xmx, ix; +void util(int x, int y) { + int ymx, dxcar, xmn, xmx, ix; /* debug('util'); */ ymx = (don[msg3][4] << 3) + 16; @@ -197,7 +197,7 @@ void util(integer x, integer y) { else ix = 3; xmx = dxcar * ix * res + xmn + 2; if ((x > xmn) && (x < xmx) && (y < ymx) && (y > 15)) { - ix = pred(integer, (cardinal)y >> 3) + (msg3 << 8); + ix = pred(int, (cardinal)y >> 3) + (msg3 << 8); if (ix != msg4) { invers(1); msg4 = ix; @@ -209,9 +209,9 @@ void util(integer x, integer y) { } } -void menu_down(integer ii) { - integer cx, xcc; - integer xco, nb_lig; +void menu_down(int ii) { + int cx, xcc; + int xco, nb_lig; /* debug('menu_down'); */ xco = don[ii][1]; @@ -228,7 +228,7 @@ void menu_down(integer ii) { putxy(xco, 16); cx = 0; do { - cx = succ(integer, cx); + cx = succ(int, cx); switch (ii) { case 1 : if (inv[cx][1] != '*') writeg(inv[cx], 4); @@ -262,7 +262,7 @@ void menu_down(integer ii) { show_mouse(); } -void menu_up(integer xx) { +void menu_up(int xx) { /* debug('menu_up'); */ if (test0) { charecr(10, succ(byte, don[xx][2]) << 1); @@ -278,7 +278,7 @@ void erase_menu() { } void mdn() { - integer x, y, c, a, ix; + int x, y, c, a, ix; boolean tes; /* debug('mdn'); */ diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp index fd4e2f5ffa..cee4e31b93 100644 --- a/engines/mortevielle/mor.cpp +++ b/engines/mortevielle/mor.cpp @@ -10,12 +10,12 @@ void testfi() { } -integer readclock() { +int readclock() { registres r; - integer s, m, h; + int s, m, h; /* debug('readclock');*/ - integer readclock_result; + int readclock_result; r.ax = 0x2c00; intr(0x21, r); { @@ -29,7 +29,7 @@ integer readclock() { return readclock_result; } -void modif(integer &nu) { +void modif(int &nu) { /* debug('modif'); */ if (nu == 26) nu = 25; if ((nu > 29) && (nu < 36)) nu = nu - 4; @@ -52,7 +52,7 @@ void modif(integer &nu) { } -void dessine(integer ad, integer x, integer y) { +void dessine(int ad, int x, int y) { /* debug('dessine'); */ hide_mouse(); writepal(numpal); @@ -72,17 +72,17 @@ void dessine_rouleau() { } -void text_color(integer c) { +void text_color(int c) { color_txt = c; } /* NIVEAU 13 */ -void text1(integer x, integer y, integer nb, integer m) { +void text1(int x, int y, int nb, int m) { phrase st; - integer tay; - integer co; + int tay; + int co; /* debug('text'); */ @@ -94,7 +94,7 @@ void text1(integer x, integer y, integer nb, integer m) { } void initouv() { - integer cx; + int cx; /* debug('initouv'); */ for (cx = 1; cx <= 7; cx ++) touv[cx] = chr(0); @@ -105,7 +105,7 @@ void ecrf1() { } void clsf1() { - integer i, j; + int i, j; /* debug('clsf1'); */ hide_mouse(); @@ -153,7 +153,7 @@ void clsf1() { } void clsf2() { - integer i, j; + int i, j; /* debug('clsf2'); */ hide_mouse(); @@ -175,34 +175,34 @@ void ecrf2() { } void ecr2(str255 str_) { - integer tab; - integer tlig; + int tab; + int tlig; /* debug('ecr2 : '+str_);*/ if (res == 1) tab = 10; else tab = 6; putxy(8, 177); - tlig = 59 + pred(integer, res) * 36; + tlig = 59 + pred(int, res) * 36; if (length(str_) < tlig) writeg(str_, 5); else if (length(str_) < (tlig << 1)) { putxy(8, 176); - writeg(copy(str_, 1, pred(integer, tlig)), 5); + writeg(copy(str_, 1, pred(int, tlig)), 5); putxy(8, 182); writeg(copy(str_, tlig, tlig << 1), 5); } else { f2_all = true; clsf2(); putxy(8, 176); - writeg(copy(str_, 1, pred(integer, tlig)), 5); + writeg(copy(str_, 1, pred(int, tlig)), 5); putxy(8, 182); - writeg(copy(str_, tlig, pred(integer, tlig << 1)), 5); + writeg(copy(str_, tlig, pred(int, tlig << 1)), 5); putxy(8, 190); writeg(copy(str_, tlig << 1, tlig * 3), 5); } } void clsf3() { - integer i, j; + int i, j; /* debug('clsf3'); */ hide_mouse(); @@ -232,7 +232,7 @@ void ecrf7() { } void clsf10() { - integer co, cod; + int co, cod; varying_string<8> st; /* debug('clsf10'); */ @@ -268,8 +268,8 @@ void stop() { exit(0); } -void paint_rect(integer x, integer y, integer dx, integer dy) { - integer co; +void paint_rect(int x, int y, int dx, int dy) { + int co; /* debug('paint_rect'); */ if (gd == cga) co = 3; @@ -277,20 +277,20 @@ void paint_rect(integer x, integer y, integer dx, integer dy) { box(co, gd, x, y, x + dx, y + dy, 255); } -integer hazard(integer min, integer max) { - integer ha1; +int hazard(int min, int max) { + int ha1; real ha2; /* debug('hazard'); */ - integer hazard_result; + int hazard_result; ha2 = Random(); ha1 = trunc(ha2 * (max - min)); hazard_result = min + ha1; return hazard_result; } -void calch(integer &j, integer &h, integer &m) { - integer th, nh; +void calch(int &j, int &h, int &m) { + int th, nh; /* debug('calch');*/ nh = readclock(); @@ -305,15 +305,15 @@ void calch(integer &j, integer &h, integer &m) { h = h - ((j - vj) * 24); } -void conv(integer x, integer &y) { - integer cx; +void conv(int x, int &y) { + int cx; /* debug('conv'); */ cx = 1; y = 128; while (cx < x) { y = (cardinal)y >> 1; - cx = succ(integer, cx); + cx = succ(int, cx); } } @@ -322,10 +322,10 @@ void okpas() { tesok = true; } -void modobj(integer m) { +void modobj(int m) { phrase str_; str30 strp; - integer i, tay; + int i, tay; /* debug('modobj'); */ strp = ' '; @@ -337,10 +337,10 @@ void modobj(integer m) { menu_disable(invt[8]); } -void modobj2(integer m, boolean t1, boolean t2) { +void modobj2(int m, boolean t1, boolean t2) { phrase str_; str30 strp; - integer i, tay; + int i, tay; /* debug('modobj'); */ strp = ' '; @@ -355,17 +355,17 @@ void modobj2(integer m, boolean t1, boolean t2) { } -void repon(integer f, integer m) { +void repon(int f, int m) { str255 str_; varying_string<40> str1; phrase st; text1 fic; - integer i, xco, dx, caspe, tay; + int i, xco, dx, caspe, tay; /* debug('repon fenetre nø'+chr(f+48));*/ if ((m > 499) && (m < 563)) { deline(m - 501 + c_st41, st, tay); - if (tay > ((58 + pred(integer, res) * 37) << 1)) f2_all = true; + if (tay > ((58 + pred(int, res) * 37) << 1)) f2_all = true; else f2_all = false; clsf2(); afftex(st, 8, 176, 85, 3, 5); @@ -413,7 +413,7 @@ void repon(integer f, integer m) { } void f3f8() { - integer co; + int co; if (res == 1) co = 107; else co = 64; @@ -424,7 +424,7 @@ void f3f8() { boite(0, 42, co, 16, 7); } -void t5(integer cx) { +void t5(int cx) { /* debug('t5'); */ if (cx == 10) blo = false; if (cx != 1) { @@ -444,8 +444,8 @@ void t5(integer cx) { if (cx != 9) bh9 = false; } -void affper(integer per) { - integer cx; +void affper(int per) { + int cx; /* debug('affper'); */ for (cx = 1; cx <= 8; cx ++) menu_disable(disc[cx]); @@ -493,10 +493,10 @@ void affper(integer per) { ipers = per; } -/* overlay */ void choix(integer min, integer max, integer &per) { +/* overlay */ void choix(int min, int max, int &per) { boolean i; - integer haz, cx, cy, cz; - long_integer per2, cz2; + int haz, cx, cy, cz; + long_int per2, cz2; /* debug('o0 choix'); */ haz = hazard(min, max); @@ -518,8 +518,8 @@ void affper(integer per) { i = false; } -/* overlay */ void cpl1(integer &p) { - integer j, h, m; +/* overlay */ void cpl1(int &p) { + int j, h, m; /* debug('o0 cpl1'); */ calch(j, h, m); @@ -533,8 +533,8 @@ void affper(integer per) { mdn(); } -/* overlay */ void cpl2(integer &p) { - integer j, h, m; +/* overlay */ void cpl2(int &p) { + int j, h, m; /* debug('o0 cpl2'); */ calch(j, h, m); @@ -545,8 +545,8 @@ void affper(integer per) { if ((h >= 0) && (h < 8)) p = 50; } -/* overlay */ void cpl3(integer &p) { - integer j, h, m; +/* overlay */ void cpl3(int &p) { + int j, h, m; /* debug('o0 cpl3'); */ calch(j, h, m); @@ -554,8 +554,8 @@ void affper(integer per) { if (((h > 9) && (h < 20)) || ((h >= 0) && (h < 9))) p = 0; } -/* overlay */ void cpl5(integer &p) { - integer j, h, m; +/* overlay */ void cpl5(int &p) { + int j, h, m; /* debug('o0 cpl5'); */ calch(j, h, m); @@ -565,8 +565,8 @@ void affper(integer per) { if ((h >= 0) && (h < 7)) p = 50; } -/* overlay */ void cpl6(integer &p) { - integer j, h, m; +/* overlay */ void cpl6(int &p) { + int j, h, m; /* debug('o0 cpl6'); */ calch(j, h, m); @@ -580,7 +580,7 @@ void person() { const char m1[] = "Vous"; const char m2[] = "ˆtes"; const char m3[] = "SEUL"; - integer cf; + int cf; str255 str_; /* debug('person'); */ @@ -595,22 +595,22 @@ void person() { ipers = 0; } -void chlm(integer &per) { +void chlm(int &per) { /* debug('chlm'); */ per = hazard(1, 2); if (per == 2) per = 128; } void pendule() { - const matrix<1, 2, 1, 12, integer> cv + const matrix<1, 2, 1, 12, int> cv = {{{{ 5, 8, 10, 8, 5, 0, -5, -8, -10, -8, -5, 0}}, {{ -5, -3, 0, 3, 5, 6, 5, 3, 0, -3, -5, -6}} } }; - const integer x = 580; - const integer y = 123; - const integer rg = 9; - integer h, co; + const int x = 580; + const int y = 123; + const int rg = 9; + int h, co; /* debug('pendule'); */ @@ -639,7 +639,7 @@ void pendule() { * NIVEAU 11 * *************/ -void debloc(integer l) { +void debloc(int l) { /* debug('debloc'); */ num = 0; x = 0; @@ -648,8 +648,8 @@ void debloc(integer l) { mpers = ipers; } -/* overlay */ void cpl10(integer &p, integer &h) { - integer j, m; +/* overlay */ void cpl10(int &p, int &h) { + int j, m; /* debug('o1 cpl10'); */ calch(j, h, m); @@ -661,8 +661,8 @@ void debloc(integer l) { if ((h >= 0) && (h < 8)) p = 5; } -/* overlay */ void cpl11(integer &p, integer &h) { - integer j, m; +/* overlay */ void cpl11(int &p, int &h) { + int j, m; /* debug('o1 cpl11'); */ calch(j, h, m); @@ -673,8 +673,8 @@ void debloc(integer l) { if ((h >= 0) && (h < 9)) p = 0; } -/* overlay */ void cpl12(integer &p) { - integer j, h, m; +/* overlay */ void cpl12(int &p) { + int j, h, m; /* debug('o1 cpl12'); */ calch(j, h, m); @@ -684,13 +684,13 @@ void debloc(integer l) { if ((h > 4) && (h < 9)) p = 15; } -/* overlay */ void cpl13(integer &p) { +/* overlay */ void cpl13(int &p) { /* debug('o1 cpl13'); */ p = 0; } -/* overlay */ void cpl15(integer &p) { - integer j, h, m; +/* overlay */ void cpl15(int &p) { + int j, h, m; /* debug('o1 cpl15'); */ calch(j, h, m); @@ -703,8 +703,8 @@ void debloc(integer l) { if ((h >= 0) && (h < 8)) p = -15; } -/* overlay */ void cpl20(integer &p, integer &h) { - integer j, m; +/* overlay */ void cpl20(int &p, int &h) { + int j, m; /* debug('o1 cpl20'); */ calch(j, h, m); @@ -715,8 +715,8 @@ void debloc(integer l) { if ((h > 4) && (h < 10)) p = -5; } -/* overlay */ void quelq1(integer l) { - integer per; +/* overlay */ void quelq1(int l) { + int per; /* debug('o1 quelq1'); */ per = hazard(1, 2); @@ -742,8 +742,8 @@ void debloc(integer l) { ipers = 10; } -/* overlay */ void quelq6(integer l) { - integer per; +/* overlay */ void quelq6(int l) { + int per; /* debug('o1 quelq6'); */ if (l == 6) bh6 = true; @@ -751,8 +751,8 @@ void debloc(integer l) { ipers = 10; } -/* overlay */ void quelq10(integer h, integer &per) { - integer min, max; +/* overlay */ void quelq10(int h, int &per) { + int min, max; /* debug('o1 quelq10'); */ if ((h >= 0) && (h < 8)) chlm(per); @@ -778,8 +778,8 @@ void debloc(integer l) { affper(per); } -/* overlay */ void quelq11(integer h, integer &per) { - integer min, max; +/* overlay */ void quelq11(int h, int &per) { + int min, max; /* debug('o1 quelq11'); */ if ((h >= 0) && (h < 8)) chlm(per); @@ -801,14 +801,14 @@ void debloc(integer l) { affper(per); } -/* overlay */ void quelq12(integer &per) { +/* overlay */ void quelq12(int &per) { /* debug('o1 quelq12'); */ chlm(per); affper(per); } -/* overlay */ void quelq15(integer &per) { - integer cx; +/* overlay */ void quelq15(int &per) { + int cx; boolean test; @@ -831,8 +831,8 @@ void debloc(integer l) { } } -/* overlay */ void quelq20(integer h, integer &per) { - integer min, max; +/* overlay */ void quelq20(int h, int &per) { + int min, max; /* debug('o1 quelq20'); */ if (((h >= 0) && (h < 10)) || ((h > 18) && (h < 24))) chlm(per); @@ -856,7 +856,7 @@ void debloc(integer l) { /* overlay */void frap() { - integer j, h, m, haz; + int j, h, m, haz; /* debug('o1 frap'); */ calch(j, h, m); @@ -868,7 +868,7 @@ void debloc(integer l) { } } -/* overlay */ void nouvp(integer l, integer &p) { +/* overlay */ void nouvp(int l, int &p) { /* debug('o1 nouvp'); */ p = 0; if (l == 1) { @@ -889,7 +889,7 @@ void debloc(integer l) { -/* overlay */ void tip(integer ip, integer &cx) { +/* overlay */ void tip(int ip, int &cx) { /* debug('o1 tip'); */ if (ip == 128) cx = 1; else if (ip == 64) cx = 2; @@ -902,7 +902,7 @@ void debloc(integer l) { } -/* overlay */ void ecfren(integer &p, integer &haz, integer cf, integer l) { +/* overlay */ void ecfren(int &p, int &haz, int cf, int l) { /* debug('o1 ecfren'); */ if (l == 0) person(); p = -500; @@ -921,8 +921,8 @@ void debloc(integer l) { } } -/* overlay */ void becfren(integer l) { - integer haz; +/* overlay */ void becfren(int l) { + int haz; /* debug('o1 becfren'); */ if ((l == 1) || (l == 4)) { @@ -947,24 +947,24 @@ void debloc(integer l) { void init_nbrepm() { const array<1, 8, byte> ipm = {{4, 5, 6, 7, 5, 6, 5, 8}}; - integer i; + int i; /* debug('init_nbrepm'); */ i = 0; do { - i = succ(integer, i); + i = succ(int, i); nbrepm[i] = ipm[i]; } while (!(i == 8)); } -void phaz(integer &haz, integer &p, integer cf) { +void phaz(int &haz, int &p, int cf) { /* debug('phaz'); */ p = p + cf; haz = hazard(1, 100); } /* overlay */ void inzon() { - integer cx; + int cx; /* debug('o2 inzon'); */ copcha(); @@ -1004,8 +1004,8 @@ void phaz(integer &haz, integer &p, integer cf) { mh = readclock(); } -/* overlay */ void pl1(integer cf) { - integer p, haz; +/* overlay */ void pl1(int cf) { + int p, haz; /* debug('o2 pl1'); */ if (((li == 1) && (! bh1) && (! bf1)) @@ -1017,8 +1017,8 @@ void phaz(integer &haz, integer &p, integer cf) { } } -/* overlay */ void pl2(integer cf) { - integer p, haz; +/* overlay */ void pl2(int cf) { + int p, haz; /* debug('o2 pl2'); */ if (! bh2) { @@ -1029,8 +1029,8 @@ void phaz(integer &haz, integer &p, integer cf) { } } -/* overlay */ void pl5(integer cf) { - integer p, haz; +/* overlay */ void pl5(int cf) { + int p, haz; /* debug('o2 pl5'); */ if (! bh5) { @@ -1041,8 +1041,8 @@ void phaz(integer &haz, integer &p, integer cf) { } } -/* overlay */ void pl6(integer cf) { - integer p, haz; +/* overlay */ void pl6(int cf) { + int p, haz; /* debug('o2 pl6'); */ if (((li == 6) && (! bh6)) || ((li == 8) && (! bh8))) { @@ -1053,8 +1053,8 @@ void phaz(integer &haz, integer &p, integer cf) { } } -/* overlayi */ void pl9(integer cf) { - integer p, haz; +/* overlayi */ void pl9(int cf) { + int p, haz; /* debug('o2 pl9'); */ if (! bh9) { @@ -1065,8 +1065,8 @@ void phaz(integer &haz, integer &p, integer cf) { } } -/* overlayi */ void pl10(integer cf) { - integer p, h, haz; +/* overlayi */ void pl10(int cf) { + int p, h, haz; /* debug('o2 pl10'); */ cpl10(p, h); @@ -1075,8 +1075,8 @@ void phaz(integer &haz, integer &p, integer cf) { else quelq10(h, p); } -/* overlay */ void pl11(integer cf) { - integer p, h, haz; +/* overlay */ void pl11(int cf) { + int p, h, haz; /* debug('o2 pl11'); */ cpl11(p, h); @@ -1085,8 +1085,8 @@ void phaz(integer &haz, integer &p, integer cf) { else quelq11(h, p); } -/* overlay */ void pl12(integer cf) { - integer p, haz; +/* overlay */ void pl12(int cf) { + int p, haz; /* debug('o2 pl12'); */ cpl12(p); @@ -1095,8 +1095,8 @@ void phaz(integer &haz, integer &p, integer cf) { else quelq12(p); } -/* overlay */ void pl13(integer cf) { - integer p, haz; +/* overlay */ void pl13(int cf) { + int p, haz; /* debug('o2 pl13'); */ cpl13(p); @@ -1105,8 +1105,8 @@ void phaz(integer &haz, integer &p, integer cf) { else quelq12(p); } -/* overlay */ void pl15(integer cf) { - integer p, haz; +/* overlay */ void pl15(int cf) { + int p, haz; /* debug('o2 pl15'); */ cpl15(p); @@ -1115,8 +1115,8 @@ void phaz(integer &haz, integer &p, integer cf) { else quelq15(p); } -/* overlay */ void pl20(integer cf) { - integer p, h, haz; +/* overlay */ void pl20(int cf) { + int p, h, haz; /* debug('o2 pl20'); */ cpl20(p, h); @@ -1125,8 +1125,8 @@ void phaz(integer &haz, integer &p, integer cf) { else quelq20(h, p); } -/* overlay */ void t11(integer l11, integer &a) { - integer p, haz, h; +/* overlay */ void t11(int l11, int &a) { + int p, haz, h; /* debug('o2 t11'); */ ecfren(p, haz, s.conf, l11); @@ -1169,7 +1169,7 @@ void phaz(integer &haz, integer &p, integer cf) { /* overlay */ void cavegre() { - integer haz; + int haz; /* debug('cavegre'); */ s.conf = s.conf + 2; @@ -1184,12 +1184,12 @@ void phaz(integer &haz, integer &p, integer cf) { person(); } -void writetp(str255 s, integer t) { +void writetp(str255 s, int t) { if (res == 2) writeg(s, t); else writeg(copy(s, 1, 25), t); } -void messint(integer nu) { +void messint(int nu) { /* debug('messint'); */ clsf1(); clsf2(); @@ -1203,8 +1203,8 @@ void messint(integer nu) { repon(7, nu); } -void aniof(integer ouf, integer num) { - integer ad, offset; +void aniof(int ouf, int num) { + int ad, offset; char c; /* debug('aniof'); */ @@ -1221,10 +1221,10 @@ void aniof(integer ouf, integer num) { show_mouse(); } -void musique(integer so) { +void musique(int so) { boolean i; - integer haz; - /* dep: array[1..5] of long_integer;*/ + int haz; + /* dep: array[1..5] of long_int;*/ /* debug('musique'); */ if (so == 0) { /*musik(0)*/ @@ -1275,8 +1275,8 @@ void musique(integer so) { } /* NIVEAU 9 */ -void dessin(integer ad) { - integer cx; +void dessin(int ad) { + int cx; /* debug('dessin'); */ if (ad != 0) dessine(ades, ((ad % 160) * 2), (ad / 160)); diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp index 734cb4806c..48db49b6da 100644 --- a/engines/mortevielle/mor2.cpp +++ b/engines/mortevielle/mor2.cpp @@ -1,4 +1,4 @@ -const array<1, 11, integer> men +const array<1, 11, int> men = {{ scacher, attacher, defoncer, dormir, entrer, fermer, frapper, manger, @@ -14,7 +14,7 @@ void tinke() { const char d4 = ']'; const char d5 = '1'; const char d6[] = "OK"; - integer cx, cy, haz, nh, cf, j, h, m, cd; + int cx, cy, haz, nh, cf, j, h, m, cd; varying_string<3> stpo; boolean am; @@ -128,7 +128,7 @@ void tinke() { } void fenat(char ans) { - integer coul; + int coul; hide_mouse(); if (gd == cga) coul = 2; @@ -141,7 +141,7 @@ void fenat(char ans) { /* NIVEAU 8 */ -void afdes(integer ad) { +void afdes(int ad) { taffich(); dessin(ad); okdes = false; @@ -149,8 +149,8 @@ void afdes(integer ad) { void tkey1(boolean d) { boolean quest; - integer x, y, c; - integer key; + int x, y, c; + int key; hide_mouse(); fenat('K'); @@ -165,8 +165,8 @@ void tkey1(boolean d) { show_mouse(); } -void tmlieu(integer mli) { - integer cx, j, i, tail; +void tmlieu(int mli) { + int cx, j, i, tail; str30 nomp; phrase st; @@ -187,7 +187,7 @@ void tmlieu(integer mli) { /* NIVEAU 7 */ -void tlu(integer af, integer ob) { +void tlu(int af, int ob) { caff = 32; afdes(0); repon(6, ob + 4000); @@ -198,9 +198,9 @@ void tlu(integer af, integer ob) { crep = 998; } -void delin(integer n) { +void delin(int n) { phrase s; - integer t; + int t; deline(n, s, t); } @@ -213,7 +213,7 @@ void affrep() { void mfouen() { - integer cx; + int cx; tmlieu(s.mlieu); for (cx = 1; cx <= 11; cx ++) menu_enable(men[cx]); @@ -232,7 +232,7 @@ void mfouen() menut(soulever, " soulever "); } -void atf3f8(integer &key) { +void atf3f8(int &key) { do { key = testou(); } while (!((key == 61) || (key == 66))); @@ -241,7 +241,7 @@ void atf3f8(integer &key) { /* NIVEAU 6 */ void tperd() { - integer cx; + int cx; initouv(); ment = 0; @@ -261,7 +261,7 @@ void tperd() { } void tsort() { - integer cx; + int cx; if ((iouv > 0) && (s.mlieu != 0)) if (s.conf < 50) s.conf = s.conf + 2; @@ -273,7 +273,7 @@ void tsort() { debloc(s.mlieu); } -void st4(integer ob) { +void st4(int ob) { crep = 997; switch (ob) { case 114 : @@ -296,8 +296,8 @@ void st4(integer ob) { } } -void cherjer(integer ob, boolean &d) { - integer cx; +void cherjer(int ob, boolean &d) { + int cx; d = false; for (cx = 1; cx <= 6; cx ++) d = (d || (ord(s.sjer[cx]) == ob)); @@ -310,14 +310,14 @@ void st1sama() { } void modinv() { - integer cx, cy, tay, i, r; + int cx, cy, tay, i, r; phrase nom; str30 nomp; cy = 0; for (cx = 1; cx <= 6; cx ++) if (s.sjer[cx] != chr(0)) { - cy = succ(integer, cy); + cy = succ(int, cy); r = (ord(s.sjer[cx]) + 400); deline(r - 501 + c_st41, nom, tay); nomp = delig; @@ -331,10 +331,10 @@ void modinv() { } } -void sparl(long_integer adr, long_integer rep) { - const array<1, 8, integer> haut +void sparl(long_int adr, long_int rep) { + const array<1, 8, int> haut = {{0, 1, -3, 6, -2, 2, 7, -1}}; - integer key, ad, tay, repint; + int key, ad, tay, repint; phrase st; repint = trunc(rep); @@ -365,7 +365,7 @@ void finfouil() { } void mfoudi() { - integer cx; + int cx; for (cx = 1; cx <= 7; cx ++) menu_disable(depl[cx]); for (cx = 1; cx <= 11; cx ++) menu_disable(men[cx]); @@ -395,10 +395,10 @@ void premtet() { /* NIVEAU 5 */ void ajchai() { - integer cx, cy, lderobj; + int cx, cy, lderobj; - cy = (acha + pred(integer, pred(integer, mchai) * 10)); + cy = (acha + pred(int, pred(int, mchai) * 10)); cx = 0; do { cx = cx + 1; @@ -409,8 +409,8 @@ void ajchai() { } else crep = 192; } -void ajjer(integer ob) { - integer cx; +void ajjer(int ob) { + int cx; cx = 0; do { @@ -423,7 +423,7 @@ void ajjer(integer ob) { } void t1sama() { /* On entre dans le manoir */ - integer j, h, m; + int j, h, m; boolean d; calch(j, h, m); @@ -502,7 +502,7 @@ void tctrm() { void quelquun() { - integer haz, cx; + int haz, cx; if (imen) erase_menu(); finfouil(); @@ -546,8 +546,8 @@ L1: } void tsuiv() { - integer cx, tbcl; - integer cl, cy; + int cx, tbcl; + int cl, cy; cy = acha + ((mchai - 1) * 10) - 1; cx = 0; @@ -572,7 +572,7 @@ void tsuiv() { void tfleche() { boolean qust; char touch; - integer dummy, cd, xmo, ymo; + int dummy, cd, xmo, ymo; if (num == 9999) return; fenat(chr(152)); @@ -596,11 +596,11 @@ void tfleche() { } } -void tcoord(integer sx) +void tcoord(int sx) { - integer sy, ix, iy, cb, cy, ib; - integer a, b, atdon; + int sy, ix, iy, cb, cy, ib; + int a, b, atdon; num = 0; @@ -611,7 +611,7 @@ void tcoord(integer sx) while (cy < caff) { a = a + tabdon[atdon]; atdon = atdon + 4; - cy = succ(integer, cy); + cy = succ(int, cy); } /* for cy:=0 to caff-1 do a:=a+ tabdon[amzon+3+4*cy]; @@ -621,19 +621,19 @@ void tcoord(integer sx) a = a + fleche; cb = 0; for (cy = 0; cy <= (sx - 2); cy ++) { - ib = (tabdon[a + cb] << 8) + tabdon[succ(integer, a + cb)]; + ib = (tabdon[a + cb] << 8) + tabdon[succ(int, a + cb)]; cb = cb + (ib * 4) + 2; } - ib = (tabdon[a + cb] << 8) + tabdon[succ(integer, a + cb)]; + ib = (tabdon[a + cb] << 8) + tabdon[succ(int, a + cb)]; if (ib == 0) goto L1; cy = 1; do { cb = cb + 2; sx = tabdon[a + cb] * res; - sy = tabdon[succ(integer, a + cb)]; + sy = tabdon[succ(int, a + cb)]; cb = cb + 2; ix = tabdon[a + cb] * res; - iy = tabdon[succ(integer, a + cb)]; + iy = tabdon[succ(int, a + cb)]; cy = cy + 1; } while (!(((x >= sx) && (x <= ix) && (y >= sy) && (y <= iy)) || (cy > ib))); @@ -648,7 +648,7 @@ L1: } -void st7(integer ob) { +void st7(int ob) { crep = 183; if ((ob == 116) || (ob == 144)) crep = 104; if ((ob == 126) || (ob == 111)) crep = 108; @@ -657,8 +657,8 @@ void st7(integer ob) { if (crep == 183) st4(ob); } -void treg(integer ob) { - integer mdes; +void treg(int ob) { + int mdes; mdes = caff; caff = ob; @@ -678,7 +678,7 @@ void treg(integer ob) { } } -void avpoing(integer &ob) { +void avpoing(int &ob) { crep = 999; if (s.derobj != 0) ajjer(s.derobj); if (crep != 139) { @@ -688,15 +688,15 @@ void avpoing(integer &ob) { } } -void rechai(integer &ch) { - integer cx; +void rechai(int &ch) { + int cx; cx = s.mlieu; if (s.mlieu == 16) cx = 14; - ch = tabdon[achai + (cx * 7) + pred(integer, num)]; + ch = tabdon[achai + (cx * 7) + pred(int, num)]; } -void t23coul(integer &l) { +void t23coul(int &l) { boolean d; cherjer(143, d); @@ -712,7 +712,7 @@ void maivid() { modobj(500); } -void st13(integer ob) { +void st13(int ob) { if ((ob == 114) || (ob == 116) || (ob == 126) || (ob == 132) || (ob == 111) || (ob == 106) || (ob == 102) || (ob == 100) || (ob == 110) || (ob == 153) || (ob == 154) || (ob == 155) || @@ -722,7 +722,7 @@ void st13(integer ob) { } void aldepl() { - integer dummy; + int dummy; dummy = do_alert("[1][Alors, utilisez le menu DEP...][ok]", 1); } diff --git a/engines/mortevielle/mort.cpp b/engines/mortevielle/mort.cpp index 7d5f33c2ab..c9e1d25d7e 100644 --- a/engines/mortevielle/mort.cpp +++ b/engines/mortevielle/mort.cpp @@ -31,7 +31,7 @@ /* ecrihexa utilitaire */ -void divers(integer np, boolean b) { +void divers(int np, boolean b) { teskbd(); do { parole(np, 0, 0); diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp index d1de4b79d2..9ce1788b2c 100644 --- a/engines/mortevielle/mouse.cpp +++ b/engines/mortevielle/mouse.cpp @@ -1,20 +1,20 @@ -const integer m_arrow = 0; -const integer m_point_hand = 1; +const int m_arrow = 0; +const int m_point_hand = 1; boolean int_m, clic; -integer m_show, +int m_show, x_s, y_s, p_o_s, mouse_shwn; -matrix<0, 5, 0, 11, integer> s_s; +matrix<0, 5, 0, 11, int> s_s; void init_mouse() { - integer i, j; + int i, j; registres reg; mouse_shwn = 0; @@ -40,13 +40,13 @@ void init_mouse() { } } -/*procedure change_mouse( t : integer ); +/*procedure change_mouse( t : int ); begin m_show:= t; end;*/ -/*procedure dessine_souris(xf,yf:integer); - var x, xx, y :integer; +/*procedure dessine_souris(xf,yf:int); + var x, xx, y :int; begin case m_show of m_arrow : begin @@ -56,10 +56,10 @@ begin end; */ void hide_mouse() { - integer i, j, k, ps, ds; + int i, j, k, ps, ds; boolean imp; - mouse_shwn = pred(integer, mouse_shwn); + mouse_shwn = pred(int, mouse_shwn); if (mouse_shwn == 0) { imp = odd(y_s); j = p_o_s; @@ -73,7 +73,7 @@ void hide_mouse() { memw[0xba00 + j] = s_s[2][k]; memw[0xba00 + j + 2] = s_s[3][k]; j = j + 80; - k = succ(integer, k); + k = succ(int, k); } while (!(k >= 5)); } break; @@ -91,7 +91,7 @@ void hide_mouse() { j = j + 0x2000; } imp = ! imp; - k = succ(integer, k); + k = succ(int, k); } while (!(k >= 8)); } } @@ -111,7 +111,7 @@ void hide_mouse() { ps = mem[0xa000 + j + 1]; mem[0xa000 + j + 1] = hi(s_s[i][k]); j = j + 80; - k = succ(integer, k); + k = succ(int, k); } while (!(k >= 8)); i = i + 1; } while (!(i == 4)); @@ -134,7 +134,7 @@ void hide_mouse() { memw[0xb800 + 0x200 * i + j + 2] = s_s[k + 3][i + (k << 2)]; } j = j + 160; - k = succ(integer, k); + k = succ(int, k); } while (!(k == 3)); } break; @@ -144,7 +144,7 @@ void hide_mouse() { } void show_mouse() { - integer i, j, k, l, + int i, j, k, l, ps, ds; boolean imp; char c; @@ -164,7 +164,7 @@ void show_mouse() { s_s[2][k] = memw[0xba00 + j]; s_s[3][k] = memw[0xba00 + j + 2]; j = j + 80; - k = succ(integer, k); + k = succ(int, k); } while (!(k >= 5)); } break; @@ -183,7 +183,7 @@ void show_mouse() { j = j + 0x2000; } imp = ! imp; - k = succ(integer, k); + k = succ(int, k); } while (!(k >= 8)); } } @@ -196,9 +196,9 @@ void show_mouse() { k = 0; j = p_o_s; do { - s_s[l][k] = mem[0xa000 + j] + (mem[0xa000 + succ(integer, j)] << 8); + s_s[l][k] = mem[0xa000 + j] + (mem[0xa000 + succ(int, j)] << 8); j = j + 80; - k = succ(integer, k); + k = succ(int, k); } while (!(k >= 8)); l = l + 1; } while (!(l == 4)); @@ -221,7 +221,7 @@ void show_mouse() { s_s[k + 3][i + (k << 2)] = memw[0xb800 + 0x200 * i + j + 2]; } j = j + 160; - k = succ(integer, k); + k = succ(int, k); } while (!(k == 3)); } break; @@ -229,7 +229,7 @@ void show_mouse() { affput(2, gd, x_s, y_s, 0, 0); } -void pos_mouse(integer x, integer y) { +void pos_mouse(int x, int y) { registres reg; if (x > 314 * res) x = 314 * res; @@ -264,7 +264,7 @@ void pos_mouse(integer x, integer y) { show_mouse(); } -void read_pos_mouse(integer &x, integer &y, integer &c) { +void read_pos_mouse(int &x, int &y, int &c) { registres reg; if (int_m) { @@ -283,7 +283,7 @@ void read_pos_mouse(integer &x, integer &y, integer &c) { void mov_mouse(boolean &funct, char &key) { boolean p_key; char in1, in2; - integer x, y, cx, cy, cd; + int x, y, cx, cy, cd; registres reg; if (int_m) { @@ -354,16 +354,16 @@ void mov_mouse(boolean &funct, char &key) { input >> kbd >> in2; switch (in2) { case 'K' : - cx = pred(integer, cx); + cx = pred(int, cx); break; case 'P' : - cy = succ(integer, cy); + cy = succ(int, cy); break; case 'M' : cx = cx + 2; break; case 'H' : - cy = pred(integer, cy); + cy = pred(int, cy); break; case RANGE_10(';', 'D') : { funct = true; diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp index 7c8f1c9f5c..ec7728745d 100644 --- a/engines/mortevielle/outtext.cpp +++ b/engines/mortevielle/outtext.cpp @@ -30,9 +30,9 @@ const array<0, 31, byte> tab31 } }; -void deline(integer num , phrase &l , integer &tl); +void deline(int num , phrase &l , int &tl); -static void cinq_huit(char &c, integer &ind, byte &pt, boolean &the_end) { +static void cinq_huit(char &c, int &ind, byte &pt, boolean &the_end) { const array<0, 31, char> rap = {{ ',', ':', '@', '!', '?', '-', '‡', ' ', '…', 'ƒ', '‚', 'Š', 'ˆ', '/', @@ -41,7 +41,7 @@ static void cinq_huit(char &c, integer &ind, byte &pt, boolean &the_end) { '6', '7', '8', '9' } }; - integer oct, ocd; + int oct, ocd; /* 5-8 */ oct = t_mot[ind]; @@ -88,8 +88,8 @@ static void cinq_huit(char &c, integer &ind, byte &pt, boolean &the_end) { } } /* 5-8 */ -void deline(integer num , phrase &l , integer &tl) { - integer i, j, ts; +void deline(int num , phrase &l , int &tl) { + int i, j, ts; char let; byte ps, k; boolean the_end; @@ -115,27 +115,27 @@ void deline(integer num , phrase &l , integer &tl) { } /* DETEX */ -void afftex(phrase ch, integer x, integer y, integer dx, integer dy, integer typ); +void afftex(phrase ch, int x, int y, int dx, int dy, int typ); -static integer l_motsuiv(integer p, phrase &ch, integer &tab) { - integer c; +static int l_motsuiv(int p, phrase &ch, int &tab) { + int c; - integer l_motsuiv_result; + int l_motsuiv_result; c = p; while (!(set::of(' ', '$', '@', eos).has(ch[p]))) p = p + 1; l_motsuiv_result = tab * (p - c); return l_motsuiv_result; } -void afftex(phrase ch, integer x, integer y, integer dx, integer dy, integer typ) { +void afftex(phrase ch, int x, int y, int dx, int dy, int typ) { boolean the_end; char touch; - integer xf, yf; - integer xc, yc; - integer tab, p; + int xf, yf; + int xc, yc; + int tab, p; varying_string<255> s; - integer i, j, nt; + int i, j, nt; /* debug(' .. Afftex');*/ diff --git a/engines/mortevielle/ovd1.cpp b/engines/mortevielle/ovd1.cpp index d40f8d39bc..c2384273f2 100644 --- a/engines/mortevielle/ovd1.cpp +++ b/engines/mortevielle/ovd1.cpp @@ -1,6 +1,6 @@ void dem2() { untyped_file f; - integer k; + int k; /* -- demande de disk 2 -- */ while (ioresult != 0); @@ -35,7 +35,7 @@ void ani50() { end;*/ /* overlay */ void aff50(boolean c) { - integer k; + int k; caff = 50; maff = 0; @@ -47,7 +47,7 @@ void ani50() { } /* overlay */ void init_menu() { - integer i, j, tai; + int i, j, tai; phrase st; untyped_file f; @@ -77,7 +77,7 @@ void ani50() { deline(i + c_dis, st, tai); dis[i] = delig + ' '; } - i = succ(integer, i); + i = succ(int, i); } while (!(i == 22)); for (i = 1; i <= 8; i ++) { disc[i] = 0x500 + i; @@ -96,7 +96,7 @@ void ani50() { /* overlay */ void charpal() { file f; file ft; - integer i, j, k; + int i, j, k; file fb; byte b; @@ -138,7 +138,7 @@ void ani50() { } /* overlay */ void chartex() { - integer i; + int i; untyped_file fibyte; phrase s; @@ -169,7 +169,7 @@ void ani50() { /* overlay */ void dialpre() { - integer cy, tay; + int cy, tay; phrase st; real ix; char ch; @@ -244,7 +244,7 @@ void ani50() { /* overlay */ void music() { untyped_file fic; - integer k; + int k; boolean fin; char ch; real x, y; @@ -326,7 +326,7 @@ void ani50() { if (newgd != gd) gd = newgd; hirs(); dessine(ades, 0, 0); - gotoxy(20 * pred(integer, res) + 8, 24); + gotoxy(20 * pred(int, res) + 8, 24); textcolor(7); cpr = "COPYRIGHT 1989 : LANKHOR"; if (set::of(ega, ams, cga, eos).has(gd)) output << cpr; diff --git a/engines/mortevielle/parole.cpp b/engines/mortevielle/parole.cpp index 3b777c3770..42a46e1209 100644 --- a/engines/mortevielle/parole.cpp +++ b/engines/mortevielle/parole.cpp @@ -1,5 +1,5 @@ -void spfrac(integer wor) { +void spfrac(int wor) { c3.rep = (cardinal)wor >> 12; if ((typlec == 0) && (c3.code != 9)) if (((c3.code > 4) && (c3.val != 20) && !(set::of(3, 6, 9, eos).has(c3.rep))) || @@ -10,7 +10,7 @@ void spfrac(integer wor) { } void charg_car() { - integer wor, int_; + int wor, int_; wor = swap(memw[adword + ptr_word]); int_ = wor & 0x3f; @@ -67,7 +67,7 @@ void veracf(byte b) { } /* overlay */ void cctable(tablint &t) { - integer k; + int k; array<0, 256, real> tb; @@ -79,7 +79,7 @@ void veracf(byte b) { } /* overlay */ void regenbruit() { - integer i, j; + int i, j; i = offsetb3 + 8590; j = 0; @@ -113,7 +113,7 @@ void veracf(byte b) { /* overlay */ void charge_bruit() { untyped_file f; - integer j, i; + int j, i; assign(f, "bruits"); reset(f); @@ -125,7 +125,7 @@ void veracf(byte b) { /* overlay */ void trait_car() { byte d3; - integer d2, i; + int d2, i; switch (c2.code) { case 9 : @@ -388,9 +388,9 @@ void veracf(byte b) { var regs : registres; buffer : array[0..511] of char; - i,j,k : integer; + i,j,k : int; st : phrase; - tay : integer; + tay : int; test : array[0..2] of boolean; const chaine : array[0..7] of char diff --git a/engines/mortevielle/parole2.cpp b/engines/mortevielle/parole2.cpp index 07ac757d77..02ec4fb908 100644 --- a/engines/mortevielle/parole2.cpp +++ b/engines/mortevielle/parole2.cpp @@ -19,10 +19,10 @@ void init_chariot() { void trait_ph() { - const array<0, 2, integer> deca + const array<0, 2, int> deca = {{300, 30, 40}}; - ptr_tcph = pred(integer, num_ph); + ptr_tcph = pred(int, num_ph); ledeb = swap(t_cph[ptr_tcph]) + deca[typlec]; lefin = swap(t_cph[ptr_tcph + 1]) + deca[typlec]; nb_word = lefin - ledeb; @@ -51,10 +51,10 @@ void trait_ph() { -void parole(integer rep, integer ht, integer typ) { - array<0, 500, integer> savph; - integer i; - integer tempo; +void parole(int rep, int ht, int typ) { + array<0, 500, int> savph; + int i; + int tempo; if (sonoff) return; diff --git a/engines/mortevielle/prog.cpp b/engines/mortevielle/prog.cpp index 7bdea5b850..62dc99f479 100644 --- a/engines/mortevielle/prog.cpp +++ b/engines/mortevielle/prog.cpp @@ -1,5 +1,5 @@ -/* overlay */ void change_gd(integer ngd) { - integer i; +/* overlay */ void change_gd(int ngd) { + int i; hide_mouse(); gd = ngd; @@ -20,10 +20,10 @@ } /* overlay */ void antegame() { - integer cx; + int cx; registres regs; array<0, 511, char> buffer; - integer i, j, k; + int i, j, k; array<0, 2, boolean> test; array<0, 7, char> g; @@ -71,7 +71,7 @@ stpou = ind_mess; while ((test[k] == false) && (k < 2)) { regs.ax = 0; - k = succ(integer, k); + k = succ(int, k); intr(19, regs); { regs.ax = 0x201; @@ -118,7 +118,7 @@ /* NIVEAU 3 */ /* procedure PROGRAMME */ void tmaj3() { - integer j, h, m; + int j, h, m; calch(j, h, m); if (m == 30) m = 1; @@ -130,7 +130,7 @@ void tmaj3() { void tsitu() { - integer h, j, m; + int h, j, m; if (! col) clsf2(); syn = false; @@ -203,14 +203,14 @@ L2: mennor(); } -void sv_game(integer n); +void sv_game(int n); -void ld_game(integer n); +void ld_game(int n); void tecran() { const char idem[] = "Idem"; - const integer lim = 20000; - integer temps; + const int lim = 20000; + int temps; char inkey; boolean oo, funct; @@ -235,11 +235,11 @@ void tecran() { erase_menu(); imen = false; if (set::of('\1', '\3', '\5', '\7', '\11', eos).has(inkey)) { - change_gd((cardinal)pred(integer, ord(inkey)) >> 1); + change_gd((cardinal)pred(int, ord(inkey)) >> 1); return; } if (choisi && (msg[3] == sauve)) sv_game(msg[4] & 7); - if (choisi && (msg[3] == charge)) ld_game(pred(integer, msg[4] & 7)); + if (choisi && (msg[3] == charge)) ld_game(pred(int, msg[4] & 7)); if (inkey == '\103') { /* F9 */ temps = do_alert(stpou, 1); return; diff --git a/engines/mortevielle/ques.cpp b/engines/mortevielle/ques.cpp index 87d0c87cd1..6f7a05e0c7 100644 --- a/engines/mortevielle/ques.cpp +++ b/engines/mortevielle/ques.cpp @@ -1,23 +1,23 @@ /* overlay */ boolean ques() { - const array<1, 10, integer> ta + const array<1, 10, int> ta = {{ 511, 516, 524, 531, 545, 552, 559, 563, 570, 576 } }; - const array<1, 10, integer> ok + const array<1, 10, int> ok = {{ 4, 7, 1, 6, 4, 4, 2, 5, 3, 1 }}; boolean q, func, test; - integer i, j, k, y, memk; - integer tay , tmax; - integer rep, prem, der; + int i, j, k, y, memk; + int tay , tmax; + int rep, prem, der; phrase st; char key; mult_rect coor; array<1, 14, str40> chaines; - integer compte; + int compte; boolean ques_result; @@ -53,7 +53,7 @@ memk = memk + 1; y = y + 8; } - for (j = 1; j <= succ(integer, der - prem); j ++) { + for (j = 1; j <= succ(int, der - prem); j ++) { { rectangle &with = coor[j]; diff --git a/engines/mortevielle/sprint.cpp b/engines/mortevielle/sprint.cpp index 854fdd6359..bdb0a1b2fd 100644 --- a/engines/mortevielle/sprint.cpp +++ b/engines/mortevielle/sprint.cpp @@ -1,16 +1,16 @@ -void fill_box(integer x, integer y, integer dx) { - box(15, gd, pred(integer, x) << 3, pred(integer, y) << 3, pred(integer, x + dx) << 3, y << 3, 255); +void fill_box(int x, int y, int dx) { + box(15, gd, pred(int, x) << 3, pred(int, y) << 3, pred(int, x + dx) << 3, y << 3, 255); } -void clear_box(integer x, integer y, integer dx) { - box(0, gd, pred(integer, x) << 3, pred(integer, y) << 3, pred(integer, x + dx) << 3, y << 3, 255); +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, integer c) +void writeg(str255 l, int c) { - integer i, x, xo, yo; - integer cecr; + int i, x, xo, yo; + int cecr; boolean t; /* debug('writeg : '+l);*/ diff --git a/engines/mortevielle/taffich.cpp b/engines/mortevielle/taffich.cpp index 00203118d8..d1e447de71 100644 --- a/engines/mortevielle/taffich.cpp +++ b/engines/mortevielle/taffich.cpp @@ -1,5 +1,5 @@ -void chardes(str11 nom, long_integer passe, integer long_) { - integer i, p, l; +void chardes(str11 nom, long_int passe, int long_) { + int i, p, l; byte b; untyped_file f; @@ -28,8 +28,8 @@ void chardes(str11 nom, long_integer passe, integer long_) { /*$i+*/ } -void charani(str11 nom, long_integer passe, integer long_) { - integer i, p, l; +void charani(str11 nom, long_int passe, int long_) { + int i, p, l; byte b; untyped_file f; @@ -67,12 +67,12 @@ void taffich() { 110, 159, 100, 100 } }; - integer i, m, a, b, cx, handle, + int i, m, a, b, cx, handle, npal; - long_integer lgt, lhandle; + long_int lgt, lhandle; str11 nom; - integer palh, k, j; - array<0, 15, integer> alllum; + int palh, k, j; + array<0, 15, int> alllum; a = caff; @@ -144,7 +144,7 @@ void taffich() { chardes(nom, lgt, handle); if (gd == her) { for (i = 0; i <= 15; i ++) { - palh = memw[0x7000 + (succ(integer, i) << 1)]; + palh = memw[0x7000 + (succ(int, i) << 1)]; alllum[i] = (palh & 15) + (((cardinal)palh >> 12) & 15) + (((cardinal)palh >> 8) & 15); } for (i = 0; i <= 15; i ++) { diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp index bdc6b59eb7..d0edc2e8c8 100644 --- a/engines/mortevielle/var_mor.cpp +++ b/engines/mortevielle/var_mor.cpp @@ -15,101 +15,101 @@ const real freq0 = 1.19318e6; -const integer seg_syst = 0x6fed; -const integer segmou = 0x6f00; -const integer segdon = 0x6c00; -const integer adani = 0x7314; -const integer adword = 0x4000; -const integer adtroct = 0x406b; -const integer adcfiec = 0x4300; -const integer adbruit = 0x5cb0;/*2C00;*/ -const integer adbruit1 = 0x6924;/*3874;*/ -const integer adbruit2 = 0x6b30;/*3A80;*/ -const integer adbruit3 = 0x6ba6;/*3AF6;*/ -const integer adbruit5 = 0x3b50; -const integer adson = 0x5cb0;/*2C00;*/ -const integer adson2 = 0x60b0;/*3000;*/ -const integer offsetb1 = 6; -const integer offsetb2 = 4; -const integer offsetb3 = 6; - -const integer null = 255; - -const integer tempo_mus = 71; -const integer tempo_bruit = 78; -const integer tempo_f = 80; -const integer tempo_m = 89; - -const integer ti1 = 410; -const integer ti2 = 250; -const integer maxti = 7975; -const integer maxtd = 600; -const integer max_rect = 14; - -const integer ams = 0; -const integer cga = 1; -const integer ega = 2; -const integer her = 3; -const integer tan = 4; - -const integer c_repon = 0; -const integer c_st41 = 186; -const integer c_tparler = 247; -const integer c_paroles = 292; -const integer c_tmlieu = 435; -const integer c_dialpre = 456; -const integer c_action = 476; -const integer c_saction = 497; -const integer c_dis = 502; -const integer c_fin = 510; /* => n'existe pas ; si !! */ - -const integer arega = 0; -const integer asoul = 154; -const integer aouvr = 282; -const integer achai = 387; -const integer acha = 492; -const integer arcf = 1272; -const integer arep = 1314; -const integer amzon = 1650; -const integer fleche = 1758; - -const integer no_choice = 0; -const integer invent = 1; -const integer depla = 2; -const integer action = 3; -const integer saction = 4; -const integer discut = 5; -const integer fichier = 6; -const integer sauve = 7; -const integer charge = 8; - -const integer attacher = 0x301; -const integer attendre = 0x302; -const integer defoncer = 0x303; -const integer dormir = 0x304; -const integer ecouter = 0x305; -const integer entrer = 0x306; -const integer fermer = 0x307; -const integer fouiller = 0x308; -const integer frapper = 0x309; -const integer gratter = 0x30a; -const integer lire = 0x30b; -const integer manger = 0x30c; -const integer mettre = 0x30d; -const integer ouvrir = 0x30e; -const integer prendre = 0x30f; -const integer regarder = 0x310; -const integer sentir = 0x311; -const integer sonder = 0x312; -const integer sortir = 0x313; -const integer soulever = 0x314; -const integer tourner = 0x315; - -const integer scacher = 0x401; -const integer sfouiller = 0x402; -const integer slire = 0x403; -const integer sposer = 0x404; -const integer sregarder = 0x405; +const int seg_syst = 0x6fed; +const int segmou = 0x6f00; +const int segdon = 0x6c00; +const int adani = 0x7314; +const int adword = 0x4000; +const int adtroct = 0x406b; +const int adcfiec = 0x4300; +const int adbruit = 0x5cb0;/*2C00;*/ +const int adbruit1 = 0x6924;/*3874;*/ +const int adbruit2 = 0x6b30;/*3A80;*/ +const int adbruit3 = 0x6ba6;/*3AF6;*/ +const int adbruit5 = 0x3b50; +const int adson = 0x5cb0;/*2C00;*/ +const int adson2 = 0x60b0;/*3000;*/ +const int offsetb1 = 6; +const int offsetb2 = 4; +const int offsetb3 = 6; + +const int null = 255; + +const int tempo_mus = 71; +const int tempo_bruit = 78; +const int tempo_f = 80; +const int tempo_m = 89; + +const int ti1 = 410; +const int ti2 = 250; +const int maxti = 7975; +const int maxtd = 600; +const int max_rect = 14; + +const int ams = 0; +const int cga = 1; +const int ega = 2; +const int her = 3; +const int tan = 4; + +const int c_repon = 0; +const int c_st41 = 186; +const int c_tparler = 247; +const int c_paroles = 292; +const int c_tmlieu = 435; +const int c_dialpre = 456; +const int c_action = 476; +const int c_saction = 497; +const int c_dis = 502; +const int c_fin = 510; /* => n'existe pas ; si !! */ + +const int arega = 0; +const int asoul = 154; +const int aouvr = 282; +const int achai = 387; +const int acha = 492; +const int arcf = 1272; +const int arep = 1314; +const int amzon = 1650; +const int fleche = 1758; + +const int no_choice = 0; +const int invent = 1; +const int depla = 2; +const int action = 3; +const int saction = 4; +const int discut = 5; +const int fichier = 6; +const int sauve = 7; +const int charge = 8; + +const int attacher = 0x301; +const int attendre = 0x302; +const int defoncer = 0x303; +const int dormir = 0x304; +const int ecouter = 0x305; +const int entrer = 0x306; +const int fermer = 0x307; +const int fouiller = 0x308; +const int frapper = 0x309; +const int gratter = 0x30a; +const int lire = 0x30b; +const int manger = 0x30c; +const int mettre = 0x30d; +const int ouvrir = 0x30e; +const int prendre = 0x30f; +const int regarder = 0x310; +const int sentir = 0x311; +const int sonder = 0x312; +const int sortir = 0x313; +const int soulever = 0x314; +const int tourner = 0x315; + +const int scacher = 0x401; +const int sfouiller = 0x402; +const int slire = 0x403; +const int sposer = 0x404; +const int sregarder = 0x405; const array<0, 17, byte> tabdbc = {{7, 23, 7, 14, 13, 9, 14, 9, 5, 12, 6, 12, 13, 4, 0, 4, 5, 9}}; @@ -165,7 +165,7 @@ const char recom[] = " Recommence "; const char f3[] = "F3: Encore"; const char f8[] = "F8: Suite"; -const integer max_patt = 20; +const int max_patt = 20; const array<0, 15, byte> rang @@ -177,29 +177,29 @@ const array<0, 15, byte> rang /*---------------------------------------------------------------------------*/ typedef varying_string<11> path_chars; -typedef real long_integer; +typedef real long_int; typedef varying_string<255> str255; typedef varying_string<125> str125; typedef varying_string<30> str30; typedef varying_string<11> str11; typedef file fichier_byte; struct sav_chaine { - integer conf; + int conf; array<0, 10, char> pourc; array<0, 42, char> teauto; array<0, 30, char> sjer; - integer mlieu, iboul, ibag, icave, ivier, ipuit; - integer derobj, iloic, icryp; + int mlieu, iboul, ibag, icave, ivier, ipuit; + int derobj, iloic, icryp; boolean ipre; char heure; }; struct registres { - integer ax, bx, cx, dx, bp, si, di, ds, es, flags; + int ax, bx, cx, dx, bp, si, di, ds, es, flags; }; typedef array<1, 1410, char> phrase; -typedef array<0, maxti, integer> tabint; +typedef array<0, maxti, int> tabint; struct ind { - integer indis; + int indis; byte point; }; typedef array<0, maxtd, ind> tabind; @@ -207,11 +207,11 @@ typedef array<0, maxtd, ind> tabind; typedef matrix<1, 7, 0, 24, byte> tab_mlieu; typedef array<0, 255, real> table; -typedef array<0, 255, integer> tablint; +typedef array<0, 255, int> tablint; -typedef integer word1; +typedef int word1; struct chariot { - integer val, + int val, code, acc, freq, @@ -222,9 +222,9 @@ struct doublet { byte x, y; }; typedef array<1, 16, doublet> tabdb; -typedef array<0, 107, integer> tfxx; +typedef array<0, 107, int> tfxx; struct rectangle { - integer x1, x2, y1, y2; + int x1, x2, y1, y2; boolean etat; }; @@ -294,7 +294,7 @@ boolean blo, active_menu; -integer x, +int x, y, t, vj, @@ -353,9 +353,9 @@ integer x, ptr_word, color_txt; -array<0, 6400, integer> t_cph; +array<0, 6400, int> t_cph; array<0, 4000, byte> tabdon; -/* t_dxx : array[0..121] of integer;*/ +/* t_dxx : array[0..121] of int;*/ str125 stpou; /* donne le % d'indices */ byte is; char mode; @@ -365,12 +365,12 @@ str125 al_mess, ind_mess, al_mess2; -array<1, 8, integer> invt, +array<1, 8, int> invt, nbrep, nbrepm, disc; -array<0, 4, integer> msg; -array<1, 7, integer> depl; +array<0, 4, int> msg; +array<1, 7, int> depl; array<1, 8, varying_string<22> > inv; array<1, 7, varying_string<23> > dep; array<1, 21, varying_string<10> > act; @@ -385,7 +385,7 @@ matrix<1, 6, 0, 23, byte> lettres; array<0, 15, byte> palher; tabint t_mot; -integer tay_tchar; +int tay_tchar; tabind t_rec; file sauv_t; untyped_file fibyte; @@ -405,14 +405,14 @@ array<0, 14, pattern> tpt; /*-------------------- PROCEDURES ET FONCTIONS ------------------------*/ /*---------------------------------------------------------------------------*/ -/* procedure box(c,Gd,xo,yo,xi,yi,patt:integer); external 'c:\mc\boite.com'; */ +/* procedure box(c,Gd,xo,yo,xi,yi,patt:int); external 'c:\mc\boite.com'; */ void hirs() { const array<0, 13, byte> tandy = {{113, 80, 90, 14, 63, 6, 50, 56, 2, 3, 6, 7, 0, 0}}; const array<0, 12, byte> herc = {{50, 40, 41, 9, 103, 3, 100, 100, 2, 3, 0, 0, 0}}; - integer i, j; + int i, j; switch (gd) { case cga : { @@ -470,13 +470,13 @@ void hirs() { } } -/* procedure affput(Chx,Gd,x,y,coul,char:integer); external 'c:\mc\divaf.com'; */ +/* procedure affput(Chx,Gd,x,y,coul,char:int); external 'c:\mc\divaf.com'; */ -void affcar(integer gd, integer x, integer y, integer coul, integer char) { +void affcar(int gd, int x, int y, int coul, int char) { if (res == 1) affput(1, gd, ((cardinal)x >> 1), y, coul, char); else affput(1, gd, x, y, coul, char); } -void putpix(integer gd, integer x, integer y, integer coul) { +void putpix(int gd, int x, int y, int coul) { affput(0, gd, x, y, coul, 0); } -- cgit v1.2.3