Skip to content

Commit

Permalink
MORTEVIELLE: integer -> int
Browse files Browse the repository at this point in the history
  • Loading branch information
@sev- @Strangerke
sev- authored and Strangerke committed Apr 6, 2012
1 parent b462cbb commit a32594f
Show file tree
Hide file tree
Showing 21 changed files with 511 additions and 511 deletions.
56 changes: 28 additions & 28 deletions engines/mortevielle/actions.cpp
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -94,7 +94,7 @@ void taller()
}

/* overlay */ void tprendre() {
integer cx, cy, cz;
int cx, cy, cz;

if (caff > 99) {
cx = caff;
Expand All @@ -115,7 +115,7 @@ void taller()
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) {
Expand Down Expand Up @@ -188,7 +188,7 @@ void taller()
}

/* overlay */ void tsprendre() {
integer cx, cy, cz;
int cx, cy, cz;

cx = 0;
do {
Expand All @@ -211,7 +211,7 @@ void taller()
/* overlay */ void tsoulever()

{
integer cx;
int cx;

if (! syn) ecr3("soulever");
tfleche();
Expand All @@ -230,12 +230,12 @@ void taller()
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 {
Expand All @@ -254,7 +254,7 @@ void taller()
}

/* overlay */ void tregarder() {
integer cx;
int cx;

if (caff > 99) {
crep = 103;
Expand Down Expand Up @@ -297,7 +297,7 @@ void taller()
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;
Expand All @@ -315,7 +315,7 @@ void taller()

/* 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);
Expand Down Expand Up @@ -386,7 +386,7 @@ void taller()
}

/* overlay */ void touvrir() {
integer cx, haz;
int cx, haz;

if (! syn) ecr3("ouvrir");
if (caff == 26) {
Expand Down Expand Up @@ -432,18 +432,18 @@ void taller()
}
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;
Expand Down Expand Up @@ -542,7 +542,7 @@ void taller()
}

/* overlay */ void ttourner() {
integer quel;
int quel;

if (caff > 99) {
crep = 149;
Expand Down Expand Up @@ -608,7 +608,7 @@ void taller()
}

/* overlay */ void tfermer() {
integer cx, chai;
int cx, chai;

if (! syn) ecr3("fermer");
if (caff < 26) {
Expand Down Expand Up @@ -637,7 +637,7 @@ void taller()
}

/* overlay */ void tfrapper() {
integer l, p, haz;
int l, p, haz;

if (! syn) ecr3("frapper");
if (s.mlieu == 15) {
Expand Down Expand Up @@ -669,7 +669,7 @@ void taller()
}

/* overlay */ void tposer() {
integer cx, chai;
int cx, chai;

if (! syn) ecr3("poser");
if (s.derobj == 0) crep = 186;
Expand Down Expand Up @@ -734,7 +734,7 @@ void taller()
}

/* overlay */ void tecouter() {
integer l, p, haz, j, h, m;
int l, p, haz, j, h, m;

if (s.mlieu != 26) crep = 101;
else {
Expand All @@ -759,7 +759,7 @@ void taller()
}

/* overlay */ void tmanger() {
integer j, h, m;
int j, h, m;

if ((s.mlieu > 15) && (s.mlieu < 26))
crep = 148;
Expand All @@ -786,7 +786,7 @@ void taller()
}

/* overlay */ void tentrer() {
integer x, z;
int x, z;

if ((s.mlieu == 21) || (s.mlieu == 22)) {
t1sama();
Expand Down Expand Up @@ -840,7 +840,7 @@ void taller()

/* 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;
Expand Down Expand Up @@ -890,7 +890,7 @@ void taller()
}

/* overlay */ void tsortir() {
integer lx;
int lx;

tsort();
crep = 0;
Expand All @@ -915,7 +915,7 @@ void taller()
}

/* overlay */ void tattendre() {
integer quel;
int quel;

mpers = 0;
clsf3();
Expand Down Expand Up @@ -951,7 +951,7 @@ void taller()

{
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;
Expand Down Expand Up @@ -994,7 +994,7 @@ void taller()
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);
Expand All @@ -1014,7 +1014,7 @@ void taller()
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;
Expand Down Expand Up @@ -1173,7 +1173,7 @@ void taller()
}

/* overlay */ void tencore() { /* Perdu !!! */
integer quel;
int quel;

clsf2();
musique(0);
Expand Down
38 changes: 19 additions & 19 deletions engines/mortevielle/alert.cpp
View file
@@ -1,17 +1,17 @@
/* 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}}
}
};



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);
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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 == "") {
Expand Down Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions engines/mortevielle/boite.cpp
View file
@@ -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();
Expand All @@ -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();
Expand Down

0 comments on commit a32594f

Please sign in to comment.