aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/mortevielle/actions.cpp12
-rw-r--r--engines/mortevielle/dialogs.cpp8
-rw-r--r--engines/mortevielle/keyboard.cpp2
-rw-r--r--engines/mortevielle/level15.cpp8
-rw-r--r--engines/mortevielle/menu.cpp16
-rw-r--r--engines/mortevielle/mor.cpp12
-rw-r--r--engines/mortevielle/mor2.cpp22
-rw-r--r--engines/mortevielle/mortevielle.cpp2
-rw-r--r--engines/mortevielle/mouse.cpp26
-rw-r--r--engines/mortevielle/parole2.cpp2
-rw-r--r--engines/mortevielle/taffich.cpp4
-rw-r--r--engines/mortevielle/var_mor.h2
12 files changed, 57 insertions, 59 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 975992ee2a..eb8bf87061 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -210,7 +210,7 @@ void fctTake() {
obpart = false;
affrep();
} else {
- tabdon[acha + (pred(int, mchai) * 10) + pred(int, cs)] = 0;
+ tabdon[acha + ((mchai - 1) * 10) + cs - 1] = 0;
tsuiv();
++dobj;
if (dobj > 6) {
@@ -344,7 +344,7 @@ void fctLift() {
cx = 14;
else if (s.mlieu == 19)
cx = 15;
- crep = tabdon[asoul + (cx << 3) + pred(int, num)];
+ crep = tabdon[asoul + (cx << 3) + (num - 1)];
if (crep == 255)
crep = 997;
}
@@ -436,7 +436,7 @@ void fctLook() {
cx -= 4;
if (s.mlieu == 26)
cx = 21;
- crep = tabdon[arega + (cx * 7) + pred(int, num)];
+ crep = tabdon[arega + (cx * 7) + num - 1];
if ((s.mlieu == 13) && (num == 8))
crep = 126;
if (s.mlieu == 19)
@@ -608,7 +608,7 @@ void fctOpen() {
cx = s.mlieu;
if (s.mlieu == 16)
cx = 14;
- crep = tabdon[aouvr + (cx * 7) + pred(int, num)];
+ crep = tabdon[aouvr + (cx * 7) + num - 1];
if (crep == 254)
crep = 999;
} else
@@ -1330,7 +1330,7 @@ void fctDiscuss() {
co = 0;
lig = 0;
do {
- icm = succ(int, icm);
+ ++icm;
g_vm->_screenSurface.putxy(co, lig);
if (s.teauto[icm] == '*')
if (te[icm])
@@ -1356,7 +1356,7 @@ void fctDiscuss() {
cx = 41;
else
cx = 1;
- cy = succ(int, ((uint)y >> 3)); /* 0-199 => 1-25 */
+ cy = ((uint)y >> 3) + 1; // 0-199 => 1-25
if ((cy > 23) || ((cx == 41) && ((cy >= 20) && (cy <= 22)))) {
if (choi != 0) {
lig = ((choi - 1) % 23) << 3;
diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index 93b556ea68..20e2898121 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -176,7 +176,7 @@ int Alert::show(const Common::String &msg, int n) {
tmp4 += " ";
g_vm->_screenSurface.writeg(tmp4, 1);
}
- charecr(50, succ(int, nligne) << 4);
+ charecr(50, (nligne + 1) << 4);
showMouse();
/* Restore the background area */
@@ -233,7 +233,7 @@ void Alert::decodeAlertDetails(Common::String s, int &nbc, int &lineNumb, int &c
}
void Alert::setPosition(int ji, int coldep, int esp) {
- g_vm->_screenSurface.putxy(coldep + (40 + esp) *pred(int, ji), 98);
+ g_vm->_screenSurface.putxy(coldep + (40 + esp) * (ji - 1), 98);
}
/**
@@ -244,7 +244,7 @@ void Alert::drawAlertBox(int lidep, int nli, int tx) {
if (tx > 640)
tx = 640;
int x = 320 - ((uint)tx >> 1);
- int y = pred(int, lidep) << 3;
+ int y = (lidep - 1) << 3;
int xx = x + tx;
int yy = y + (nli << 3);
g_vm->_screenSurface.fillRect(15, Common::Rect(x, y, xx, yy));
@@ -338,7 +338,7 @@ bool Ques::show() {
++memk;
y += 8;
}
- for (j = 1; j <= succ(int, der - prem); ++j) {
+ for (j = 1; j <= der - prem + 1; ++j) {
rectangle &with = coor[j];
with.x1 = 45 * res;
diff --git a/engines/mortevielle/keyboard.cpp b/engines/mortevielle/keyboard.cpp
index 679264bff9..0306e71962 100644
--- a/engines/mortevielle/keyboard.cpp
+++ b/engines/mortevielle/keyboard.cpp
@@ -47,7 +47,7 @@ int testou() {
case '\26' :
if ((c_zzz == 1) && (c_zzz == 2)) {
zzuul(&adcfiec[161 * 16], ((822 * 128) - (161 * 16)) / 64);
- c_zzz = succ(int, c_zzz);
+ ++c_zzz;
return 61;
}
diff --git a/engines/mortevielle/level15.cpp b/engines/mortevielle/level15.cpp
index e1bba275e7..57eaa4dccc 100644
--- a/engines/mortevielle/level15.cpp
+++ b/engines/mortevielle/level15.cpp
@@ -40,7 +40,7 @@ void copcha() {
int i = acha;
do {
tabdon[i] = tabdon[i + 390];
- i = succ(int, i);
+ ++i;
} while (!(i == acha + 390));
}
@@ -62,7 +62,7 @@ void outbloc(int n, pattern p, t_nhom pal) {
ad += 4;
for (int i = 1; i <= p.tax; ++i)
for (int j = 1; j <= p.tay; ++j)
- mem[0x6000 * 16 + ad + pred(int, j)*p.tax + pred(int, i)] = pal[n].hom[p.des[i][j]];
+ mem[(0x6000 * 16) + ad + (j - 1) * p.tax + i - 1] = pal[n].hom[p.des[i][j]];
}
void writepal(int n) {
@@ -73,8 +73,8 @@ void writepal(int n) {
case MODE_EGA:
case MODE_AMSTRAD1512:
for (int i = 1; i <= 16; ++i) {
- mem[0x7000 * 16 + 2 * i] = tabpal[n][i].x;
- mem[0x7000 * 16 + succ(int, 2 * i)] = tabpal[n][i].y;
+ mem[(0x7000 * 16) + (2 * i)] = tabpal[n][i].x;
+ mem[(0x7000 * 16) + (2 * i) + 1] = tabpal[n][i].y;
}
break;
case MODE_CGA:
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index 78d9449b03..1f8f3460e1 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -175,8 +175,8 @@ void Menu::menu_aff() {
msk = (uint)msk >> 1;
++x;
}
- ind_tabl = succ(int, ind_tabl);
- k = succ(int, k);
+ ++ind_tabl;
+ ++k;
} while (!(k == 3));
++y;
} while (!(y == 9));
@@ -204,7 +204,7 @@ void Menu::invers(int ix) {
if (msg4 == OPCODE_NONE)
return;
- g_vm->_screenSurface.putxy(don[msg3][1] << 3, succ(void, lo(msg4)) << 3);
+ g_vm->_screenSurface.putxy(don[msg3][1] << 3, (lo(msg4) + 1) << 3);
switch (msg3) {
case 1:
s = _inv[lo(msg4)];
@@ -260,7 +260,7 @@ void Menu::util(int x, int y) {
ix = 3;
int xmx = dxcar * ix * res + xmn + 2;
if ((x > xmn) && (x < xmx) && (y < ymx) && (y > 15)) {
- ix = pred(int, ((uint)y >> 3)) + (msg3 << 8);
+ ix = (((uint)y >> 3) - 1) + (msg3 << 8);
if (ix != msg4) {
invers(1);
msg4 = ix;
@@ -288,7 +288,7 @@ void Menu::menuDown(int ii) {
xco = don[ii][1];
nb_lig = don[ii][4];
hideMouse();
- sauvecr(10, succ(byte, don[ii][2]) << 1);
+ sauvecr(10, (don[ii][2] + 1) << 1);
xco = xco << 3;
if (res == 1)
cx = 10;
@@ -301,7 +301,7 @@ void Menu::menuDown(int ii) {
g_vm->_screenSurface.putxy(xco, 16);
cx = 0;
do {
- cx = succ(int, cx);
+ ++cx;
switch (ii) {
case 1:
if (_inv[cx][0] != '*')
@@ -358,7 +358,7 @@ void Menu::menuDown(int ii) {
void Menu::menuUp(int xx) {
/* debug('menuUp'); */
if (test0) {
- charecr(10, succ(byte, don[xx][2]) << 1);
+ charecr(10, (don[xx][2] + 1) << 1);
/* Restore the background area */
assert(g_vm->_screenSurface.pitch == g_vm->_backgroundSurface.pitch);
@@ -501,7 +501,7 @@ void Menu::initMenu() {
deline(i + c_dis, st, tai);
_dis[i] = delig + ' ';
}
- i = succ(int, i);
+ ++i;
} while (!(i == 22));
for (i = 1; i <= 8; ++i) {
_disc[i] = 0x500 + i;
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index 6707587184..6fe396f3cc 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -188,21 +188,21 @@ void ecr2(Common::String str_) {
else
tab = 6;
g_vm->_screenSurface.putxy(8, 177);
- int tlig = 59 + pred(int, res) * 36;
+ int tlig = 59 + (res - 1) * 36;
if ((int)str_.size() < tlig)
g_vm->_screenSurface.writeg(str_, 5);
else if ((int)str_.size() < (tlig << 1)) {
g_vm->_screenSurface.putxy(8, 176);
- g_vm->_screenSurface.writeg(copy(str_, 1, pred(int, tlig)), 5);
+ g_vm->_screenSurface.writeg(copy(str_, 1, (tlig - 1)), 5);
g_vm->_screenSurface.putxy(8, 182);
g_vm->_screenSurface.writeg(copy(str_, tlig, tlig << 1), 5);
} else {
f2_all = true;
clsf2();
g_vm->_screenSurface.putxy(8, 176);
- g_vm->_screenSurface.writeg(copy(str_, 1, pred(int, tlig)), 5);
+ g_vm->_screenSurface.writeg(copy(str_, 1, (tlig - 1)), 5);
g_vm->_screenSurface.putxy(8, 182);
- g_vm->_screenSurface.writeg(copy(str_, tlig, pred(int, (tlig << 1))), 5);
+ g_vm->_screenSurface.writeg(copy(str_, tlig, ((tlig << 1) - 1)), 5);
g_vm->_screenSurface.putxy(8, 190);
g_vm->_screenSurface.writeg(copy(str_, tlig << 1, tlig * 3), 5);
}
@@ -303,7 +303,7 @@ void conv(int x, int &y) {
y = 128;
while (cx < x) {
y = (uint)y >> 1;
- cx = succ(int, cx);
+ ++cx;
}
}
@@ -351,7 +351,7 @@ void repon(int f, int m) {
if ((m > 499) && (m < 563)) {
deline(m - 501 + c_st41, st, tay);
- if (tay > ((58 + pred(int, res) * 37) << 1))
+ if (tay > ((58 + (res - 1) * 37) << 1))
f2_all = true;
else
f2_all = false;
diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp
index 9ded5a16f9..9a06668ec8 100644
--- a/engines/mortevielle/mor2.cpp
+++ b/engines/mortevielle/mor2.cpp
@@ -395,9 +395,9 @@ void modinv() {
Common::String nomp;
int cy = 0;
- for (int cx = 1; cx <= 6; cx++)
+ for (int cx = 1; cx <= 6; ++cx)
if (s.sjer[cx] != chr(0)) {
- cy = succ(int, cy);
+ ++cy;
r = (ord(s.sjer[cx]) + 400);
deline(r - 501 + c_st41, nom, tay);
nomp = delig;
@@ -405,7 +405,7 @@ void modinv() {
g_vm->_menu.enableMenuItem(g_vm->_menu._invt[cx]);
}
if (cy < 6)
- for (int cx = cy + 1; cx <= 6; cx++) {
+ for (int cx = cy + 1; cx <= 6; ++cx) {
g_vm->_menu.menut(g_vm->_menu._invt[cx], " ");
g_vm->_menu.disableMenuItem(g_vm->_menu._invt[cx]);
}
@@ -464,7 +464,7 @@ void premtet() {
void ajchai() {
- int cy = (acha + pred(int, pred(int, mchai) * 10));
+ int cy = acha + ((mchai - 1) * 10) - 1;
int cx = 0;
do {
++cx;
@@ -696,7 +696,7 @@ void tcoord(int sx) {
while (cy < caff) {
a += tabdon[atdon];
atdon += 4;
- cy = succ(int, cy);
+ ++cy;
}
b = tabdon[atdon];
@@ -704,11 +704,11 @@ void tcoord(int sx) {
goto L1;
a += fleche;
cb = 0;
- for (cy = 0; cy <= (sx - 2); cy++) {
- ib = (tabdon[a + cb] << 8) + tabdon[succ(int, a + cb)];
+ for (cy = 0; cy <= (sx - 2); ++cy) {
+ ib = (tabdon[a + cb] << 8) + tabdon[(a + cb + 1)];
cb += (ib * 4) + 2;
}
- ib = (tabdon[a + cb] << 8) + tabdon[succ(int, a + cb)];
+ ib = (tabdon[a + cb] << 8) + tabdon[(a + cb + 1)];
if (ib == 0)
goto L1;
@@ -716,10 +716,10 @@ void tcoord(int sx) {
do {
cb += 2;
sx = tabdon[a + cb] * res;
- sy = tabdon[succ(int, a + cb)];
+ sy = tabdon[(a + cb + 1)];
cb += 2;
ix = tabdon[a + cb] * res;
- iy = tabdon[succ(int, a + cb)];
+ iy = tabdon[(a + cb + 1)];
++cy;
} while (!(((x >= sx) && (x <= ix) && (y >= sy) && (y <= iy)) || (cy > ib)));
@@ -794,7 +794,7 @@ void rechai(int &ch) {
cx = s.mlieu;
if (s.mlieu == 16)
cx = 14;
- ch = tabdon[achai + (cx * 7) + pred(int, num)];
+ ch = tabdon[achai + (cx * 7) + num - 1];
}
void t23coul(int &l) {
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 67621d036d..7c7524235b 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -562,7 +562,7 @@ void MortevielleEngine::handleAction() {
g_vm->_menu.eraseMenu();
imen = false;
if ((inkey == '\1') || (inkey == '\3') || (inkey == '\5') || (inkey == '\7') || (inkey == '\11')) {
- changeGraphicalDevice((uint)pred(int, ord(inkey)) >> 1);
+ changeGraphicalDevice((uint)(ord(inkey) - 1) >> 1);
return;
}
if (choisi && (msg[3] == sauve)) {
diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index c96e92f0a8..a3676664d3 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -85,7 +85,7 @@ void hideMouse() {
int i, j, k, ps;;
bool imp;
- mouse_shwn = pred(int, mouse_shwn);
+ --mouse_shwn;
if (mouse_shwn == 0) {
imp = odd(y_s);
j = p_o_s;
@@ -99,7 +99,7 @@ void hideMouse() {
WRITE_LE_UINT16(&mem[0xba00 * 16 + j], s_s[2][k]);
WRITE_LE_UINT16(&mem[0xba00 * 16 + j + 2], s_s[3][k]);
j += 80;
- k = succ(int, k);
+ ++k;
} while (!(k >= 5));
break;
case MODE_AMSTRAD1512:
@@ -116,7 +116,7 @@ void hideMouse() {
j += 0x2000;
}
imp = !imp;
- k = succ(int, k);
+ ++k;
} while (!(k >= 8));
}
break;
@@ -135,7 +135,7 @@ void hideMouse() {
ps = mem[0xa000 * 16 + j + 1];
mem[0xa000 * 16 + j + 1] = hi(s_s[i][k]);
j += 80;
- k = succ(int, k);
+ ++k;
} while (!(k >= 8));
++i;
} while (!(i == 4));
@@ -157,7 +157,7 @@ void hideMouse() {
WRITE_LE_UINT16(&mem[0xb800 * 16 + 0x200 * i + j + 2], s_s[k + 3][i + (k << 2)]);
}
j += 160;
- k = succ(int, k);
+ ++k;
} while (!(k == 3));
break;
default:
@@ -190,7 +190,7 @@ void showMouse() {
s_s[2][k] = READ_LE_UINT16(&mem[0xba00 * 16 + j]);
s_s[3][k] = READ_LE_UINT16(&mem[0xba00 * 16 + j + 2]);
j += 80;
- k = succ(int, k);
+ ++k;
} while (!(k >= 5));
break;
case MODE_AMSTRAD1512:
@@ -208,7 +208,7 @@ void showMouse() {
j += 0x2000;
}
imp = !imp;
- k = succ(int, k);
+ ++k;
} while (!(k >= 8));
}
break;
@@ -220,9 +220,9 @@ void showMouse() {
k = 0;
j = p_o_s;
do {
- s_s[l][k] = mem[0xa000 * 16 + j] + (mem[0xa000 * 16 + succ(int, j)] << 8);
+ s_s[l][k] = mem[0xa000 * 16 + j] + (mem[(0xa000 * 16) + j + 1] << 8);
j += 80;
- k = succ(int, k);
+ ++k;
} while (!(k >= 8));
++l;
} while (!(l == 4));
@@ -244,7 +244,7 @@ void showMouse() {
s_s[k + 3][i + (k << 2)] = READ_LE_UINT16(&mem[0xb800 * 16 + 0x200 * i + j + 2]);
}
j += 160;
- k = succ(int, k);
+ ++k;
} while (!(k == 3));
break;
default:
@@ -357,16 +357,16 @@ void moveMouse(bool &funct, char &key) {
} else {
switch (in2) {
case 'K':
- cx = pred(int, cx);
+ --cx;
break;
case 'P':
- cy = succ(int, cy);
+ ++cy;
break;
case 'M':
cx += 2;
break;
case 'H':
- cy = pred(int, cy);
+ --cy;
break;
case 'G':
--cx;
diff --git a/engines/mortevielle/parole2.cpp b/engines/mortevielle/parole2.cpp
index 785e49acaa..c493e19a79 100644
--- a/engines/mortevielle/parole2.cpp
+++ b/engines/mortevielle/parole2.cpp
@@ -54,7 +54,7 @@ void init_chariot() {
void trait_ph() {
const int deca[3] = {300, 30, 40};
- ptr_tcph = pred(int, num_ph);
+ ptr_tcph = num_ph - 1;
ledeb = swap(t_cph[ptr_tcph]) + deca[typlec];
lefin = swap(t_cph[ptr_tcph + 1]) + deca[typlec];
nb_word = lefin - ledeb;
diff --git a/engines/mortevielle/taffich.cpp b/engines/mortevielle/taffich.cpp
index 46df0b4e3b..29cdc0a288 100644
--- a/engines/mortevielle/taffich.cpp
+++ b/engines/mortevielle/taffich.cpp
@@ -210,7 +210,7 @@ void taffich() {
chardes(filename, lgt, handle);
if (_currGraphicalDevice == MODE_HERCULES) {
for (i = 0; i <= 15; ++i) {
- palh = READ_LE_UINT16(&mem[0x7000 * 16 + (succ(int, i) << 1)]);
+ palh = READ_LE_UINT16(&mem[(0x7000 * 16) + ((i + 1) << 1)]);
alllum[i] = (palh & 15) + (((uint)palh >> 12) & 15) + (((uint)palh >> 8) & 15);
}
for (i = 0; i <= 15; ++i) {
@@ -218,7 +218,7 @@ void taffich() {
for (j = 0; j <= 15; ++j)
if (alllum[j] > alllum[k])
k = j;
- mem[0x7000 * 16 + 2 + (k << 1)] = rang[i];
+ mem[(0x7000 * 16) + 2 + (k << 1)] = rang[i];
alllum[k] = -1;
}
}
diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h
index a6d40e5b77..069a603dd2 100644
--- a/engines/mortevielle/var_mor.h
+++ b/engines/mortevielle/var_mor.h
@@ -62,8 +62,6 @@ namespace Mortevielle {
/*------------------------- DEFINES ----------------------------------*/
/*---------------------------------------------------------------------------*/
-#define pred(type, v) ((v) - 1)
-#define succ(type, v) ((v) + 1)
#define ord(v) ((int) v)
#define chr(v) ((char) v)
#define lo(v) ((v) & 0xff)
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 14:20:09 +0000