aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/mortevielle/actions.cpp22
-rw-r--r--engines/mortevielle/dialogs.cpp10
-rw-r--r--engines/mortevielle/graphics.cpp4
-rw-r--r--engines/mortevielle/level15.cpp2
-rw-r--r--engines/mortevielle/menu.cpp10
-rw-r--r--engines/mortevielle/mor.cpp2
-rw-r--r--engines/mortevielle/mor2.cpp10
-rw-r--r--engines/mortevielle/mortevielle.cpp2
-rw-r--r--engines/mortevielle/mouse.cpp20
-rw-r--r--engines/mortevielle/outtext.cpp4
-rw-r--r--engines/mortevielle/ovd1.cpp2
-rw-r--r--engines/mortevielle/parole.cpp18
-rw-r--r--engines/mortevielle/parole2.cpp4
13 files changed, 55 insertions, 55 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 1f83c5c6a7..6aea0e691d 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -89,7 +89,7 @@ void fctMove() {
cx = 0;
do {
++cx;
- } while (!(g_vm->_menu._depl[cx] == msg[4]));
+ } while (g_vm->_menu._depl[cx] != msg[4]);
if (s.mlieu == 19) {
if (cx == 1)
t1deva();
@@ -297,14 +297,14 @@ void tsprendre() {
cx = 0;
do {
++cx;
- } while (!(g_vm->_menu._invt[cx] == msg[4]));
+ } while (g_vm->_menu._invt[cx] != msg[4]);
cz = 0;
cy = 0;
do {
++cy;
if (ord(s.sjer[cy]) != 0)
++cz;
- } while (!(cz == cx));
+ } while (cz != cx);
cz = ord(s.sjer[cy]);
s.sjer[cy] = chr(0);
modinv();
@@ -491,7 +491,7 @@ void fctSearch() {
cx = 0;
do {
++cx;
- } while (!((cx > 6) || (num == ord(touv[cx]))));
+ } while ((cx <= 6) && (num != ord(touv[cx])));
if (num != ord(touv[cx]))
crep = 187;
else {
@@ -848,7 +848,7 @@ void fctClose() {
cx = 0;
do {
++cx;
- } while (!((cx > 6) || (num == ord(touv[cx]))));
+ } while ((cx <= 6) && (num != ord(touv[cx])));
if (num == ord(touv[cx])) {
aniof(2, num);
crep = 998;
@@ -941,7 +941,7 @@ void fctPut() {
cx = 0;
do {
++cx;
- } while (!((cx > 6) || (num == ord(touv[cx]))));
+ } while ((cx <= 6) && (num != ord(touv[cx])));
if (num != ord(touv[cx]))
crep = 187;
else {
@@ -1174,7 +1174,7 @@ void fctSleep() {
tinke();
answer = Alert::show(g_vm->getString(S_YES_NO), 1);
anyone = false;
- } while (!(answer == 1));
+ } while (answer != 1);
crep = 998;
num = 0;
}
@@ -1262,7 +1262,7 @@ void fctWait() {
}
repon(2, 102);
answer = Alert::show(g_vm->getString(S_YES_NO), 1);
- } while (!(answer == 2));
+ } while (answer != 2);
crep = 998;
if (!anyone)
tinke();
@@ -1303,7 +1303,7 @@ void fctDiscuss() {
cx = 0;
do {
++cx;
- } while (!(g_vm->_menu._disc[cx] == msg[4]));
+ } while (g_vm->_menu._disc[cx] != msg[4]);
caff = 69 + cx;
afdes(0);
repon(2, caff);
@@ -1345,7 +1345,7 @@ void fctDiscuss() {
co = 320;
} else
lig = lig + 8;
- } while (!(icm == 42));
+ } while (icm != 42);
g_vm->_screenSurface.putxy(320, 176);
writetp(lib[46], 0);
tou = '\0';
@@ -1458,7 +1458,7 @@ void fctDiscuss() {
hirs();
showMouse();
}
- } while (!((choi == 46) || (suj == 138)));
+ } while ((choi != 46) && (suj != 138));
if (col) {
s.conf = s.conf + (3 * (s.conf / 10));
hideMouse();
diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index 7cf12cb1bd..5c53616e25 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -87,7 +87,7 @@ int Alert::show(const Common::String &msg, int n) {
g_vm->_screenSurface._textPos.y += 6;
g_vm->_screenSurface.writeg(st, 4);
++i;
- } while (!(chaine[i] == ']'));
+ } while (chaine[i] != ']');
}
if (caseNumb == 1)
esp = nbcol - 40;
@@ -263,7 +263,7 @@ void Alert::setButtonText(Common::String c, int coldep, int nbcase, Common::Stri
++i;
ch = c[i];
str[l] += ch;
- } while (!(c[i + 1] == ']'));
+ } while (c[i + 1] != ']');
i += 2;
while (str[l].size() < 3)
@@ -413,7 +413,7 @@ bool Ques::show() {
// tesok is set to true in testprot()
tesok = true;
}
- } while (!(indx == 10));
+ } while (indx != 10);
return (correctCount == 10) && protectionCheck;
}
@@ -458,7 +458,7 @@ void f3f8::checkForF8(int SpeechNum, bool drawAni50Fl) {
hirs();
aff50(drawAni50Fl);
}
- } while (!(key == 66)); // keycode for F8
+ } while (key != 66); // keycode for F8
}
/**
@@ -469,7 +469,7 @@ void f3f8::waitForF3F8(int &key) {
do {
key = testou();
CHECK_QUIT;
- } while (!((key == 61) || (key == 66)));
+ } while ((key != 61) && (key != 66));
}
void f3f8::aff50(bool drawAni50Fl) {
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index acc2bb0d34..7511b21ce2 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -1117,7 +1117,7 @@ void ScreenSurface::drawLine(int x, int y, int xx, int yy, int coul) {
do {
g_vm->_screenSurface.setPixel(Common::Point(abs((int)(a * i + b)), i), coul);
i = i + step;
- } while (!(i == yy));
+ } while (i != yy);
} else {
a = (float)((y - yy)) / (x - xx);
b = ((yro * xr) - (yr * xro)) / (x - xx);
@@ -1127,7 +1127,7 @@ void ScreenSurface::drawLine(int x, int y, int xx, int yy, int coul) {
do {
g_vm->_screenSurface.setPixel(Common::Point(i, abs((int)(a * i + b))), coul);
i = i + step;
- } while (!(i == xx));
+ } while (i != xx);
}
}
diff --git a/engines/mortevielle/level15.cpp b/engines/mortevielle/level15.cpp
index 57eaa4dccc..f90e1aa714 100644
--- a/engines/mortevielle/level15.cpp
+++ b/engines/mortevielle/level15.cpp
@@ -41,7 +41,7 @@ void copcha() {
do {
tabdon[i] = tabdon[i + 390];
++i;
- } while (!(i == acha + 390));
+ } while (i != acha + 390);
}
bool dans_rect(rectangle r) {
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index 7cf6a316dd..bb901a15d8 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -177,11 +177,11 @@ void Menu::menu_aff() {
}
++ind_tabl;
++k;
- } while (!(k == 3));
+ } while (k != 3);
++y;
- } while (!(y == 9));
+ } while (y != 9);
col += 48 * res;
- } while (!(num_letr == 6));
+ } while (num_letr != 6);
showMouse();
}
@@ -347,7 +347,7 @@ void Menu::menuDown(int ii) {
break;
}
g_vm->_screenSurface.putxy(xco, g_vm->_screenSurface._textPos.y + 8);
- } while (!(cx == nb_lig));
+ } while (cx != nb_lig);
test0 = true;
showMouse();
}
@@ -504,7 +504,7 @@ void Menu::initMenu() {
_dis[i] = delig + ' ';
}
++i;
- } while (!(i == 22));
+ } while (i != 22);
for (i = 1; i <= 8; ++i) {
_disc[i] = 0x500 + i;
if (i < 8)
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index b740ad24dc..f8873c66b0 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -874,7 +874,7 @@ void quelq15(int &per) {
((cx == 6) && bh1) ||
((cx == 7) && bf1) ||
((cx == 8) && bh5));
- } while (!(! test));
+ } while (test);
conv(cx, per);
affper(per);
diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp
index 0a9637523d..c235186c8a 100644
--- a/engines/mortevielle/mor2.cpp
+++ b/engines/mortevielle/mor2.cpp
@@ -60,7 +60,7 @@ void tinke() {
if (nbrepm[cx] != 0)
--nbrepm[cx];
nbrep[cx] = 0;
- } while (!(cx == 8));
+ } while (cx != 8);
}
if ((h > _hour) || ((h == 0) && (_hour == 23))) {
_hour = h;
@@ -414,7 +414,7 @@ void sparl(float adr, float rep) {
parole(repint, haut[caff - 69], 0);
f3f8::waitForF3F8(key);
CHECK_QUIT;
- } while (!(key == 66));
+ } while (key != 66);
hirs();
showMouse();
}
@@ -455,7 +455,7 @@ void ajchai() {
int cx = 0;
do {
++cx;
- } while (!((cx > 9) || (tabdon[cy + cx] == 0)));
+ } while ((cx <= 9) && (tabdon[cy + cx] != 0));
if (tabdon[cy + cx] == 0) {
int lderobj = s.derobj;
@@ -468,7 +468,7 @@ void ajjer(int ob) {
int cx = 0;
do {
++cx;
- } while (!((cx > 5) || (ord(s.sjer[cx]) == 0)));
+ } while ((cx <= 5) && (ord(s.sjer[cx]) != 0));
if (ord(s.sjer[cx]) == 0) {
s.sjer[(cx)] = chr(ob);
@@ -620,7 +620,7 @@ void tsuiv() {
cs = cs + 1;
cl = cy + cs;
tbcl = tabdon[cl];
- } while (!((tbcl != 0) || (cs > 9)));
+ } while ((tbcl == 0) && (cs <= 9));
if ((tbcl != 0) && (cs < 11)) {
is = is + 1;
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 3a744fa2e2..6be14bdfa9 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -630,7 +630,7 @@ void MortevielleEngine::handleAction() {
if ((! syn) || (col))
repon(2, crep);
}
- } while (!(! syn));
+ } while (syn);
if (ctrm != 0)
tctrm();
}
diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index a3676664d3..e7da3c3074 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -100,7 +100,7 @@ void hideMouse() {
WRITE_LE_UINT16(&mem[0xba00 * 16 + j + 2], s_s[3][k]);
j += 80;
++k;
- } while (!(k >= 5));
+ } while (k < 5);
break;
case MODE_AMSTRAD1512:
for (i = 0; i <= 3; ++i) {
@@ -117,7 +117,7 @@ void hideMouse() {
}
imp = !imp;
++k;
- } while (!(k >= 8));
+ } while (k < 8);
}
break;
case MODE_EGA:
@@ -136,9 +136,9 @@ void hideMouse() {
mem[0xa000 * 16 + j + 1] = hi(s_s[i][k]);
j += 80;
++k;
- } while (!(k >= 8));
+ } while (k < 8);
++i;
- } while (!(i == 4));
+ } while (i != 4);
break;
case MODE_HERCULES:
j = ((uint)y_s >> 1) * 80 + ((uint)x_s >> 3);
@@ -158,7 +158,7 @@ void hideMouse() {
}
j += 160;
++k;
- } while (!(k == 3));
+ } while (k != 3);
break;
default:
break;
@@ -191,7 +191,7 @@ void showMouse() {
s_s[3][k] = READ_LE_UINT16(&mem[0xba00 * 16 + j + 2]);
j += 80;
++k;
- } while (!(k >= 5));
+ } while (k < 5);
break;
case MODE_AMSTRAD1512:
for (i = 0; i <= 3; ++i) {
@@ -209,7 +209,7 @@ void showMouse() {
}
imp = !imp;
++k;
- } while (!(k >= 8));
+ } while (k < 8);
}
break;
case MODE_EGA:
@@ -223,9 +223,9 @@ void showMouse() {
s_s[l][k] = mem[0xa000 * 16 + j] + (mem[(0xa000 * 16) + j + 1] << 8);
j += 80;
++k;
- } while (!(k >= 8));
+ } while (k < 8);
++l;
- } while (!(l == 4));
+ } while (l != 4);
break;
case MODE_HERCULES:
j = ((uint)y_s >> 1) * 80 + ((uint)x_s >> 3);
@@ -245,7 +245,7 @@ void showMouse() {
}
j += 160;
++k;
- } while (!(k == 3));
+ } while (k != 3);
break;
default:
break;
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index ceac79aacd..1c73f7ab4d 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -222,9 +222,9 @@ void afftex(char *ch, int x, int y, int dx, int dy, int typ) {
g_vm->_screenSurface.putxy(j, i);
g_vm->_screenSurface.writeg(" ", 0);
j += 6;
- } while (!(j > xf));
+ } while (j <= xf);
i += 6;
- } while (!(i > yf));
+ } while (i <= yf);
yc = y;
}
g_vm->_screenSurface.putxy(xc, yc);
diff --git a/engines/mortevielle/ovd1.cpp b/engines/mortevielle/ovd1.cpp
index 84f57402ea..74639d32db 100644
--- a/engines/mortevielle/ovd1.cpp
+++ b/engines/mortevielle/ovd1.cpp
@@ -183,7 +183,7 @@ void music() {
fic.read(&mem[0x47a0 * 16 + 0], 123);
fic.close();
- g_vm->_soundManager.demus(&mem[0x3800 * 16], &mem[0x5000 * 16], 623);
+ g_vm->_soundManager.decodeMusic(&mem[0x3800 * 16], &mem[0x5000 * 16], 623);
addfix = (float)((tempo_mus - addv[1])) / 256;
cctable(tbi);
diff --git a/engines/mortevielle/parole.cpp b/engines/mortevielle/parole.cpp
index 02f298e8f6..e86b647f36 100644
--- a/engines/mortevielle/parole.cpp
+++ b/engines/mortevielle/parole.cpp
@@ -112,7 +112,7 @@ void regenbruit() {
t_cph[j] = READ_LE_UINT16(&mem[adbruit3 + i]);
i += 2;
++j;
- } while (!(i >= offsetb3 + 8790));
+ } while (i < offsetb3 + 8790);
}
void charge_son() {
@@ -123,7 +123,7 @@ void charge_son() {
f.read(&mem[0x7414 * 16 + 0], 273);
- g_vm->_soundManager.demus(&mem[0x7414 * 16], &mem[adson * 16], 273);
+ g_vm->_soundManager.decodeMusic(&mem[0x7414 * 16], &mem[adson * 16], 273);
f.close();
}
@@ -209,7 +209,7 @@ void trait_car() {
else
entroct(d3);
entroct(3);
- } while (!(i < 0));
+ } while (i >= 0);
}
if (d3 == null) {
entroct(4);
@@ -234,7 +234,7 @@ void trait_car() {
else
entroct(d3);
entroct(3);
- } while (!(i < 0));
+ } while (i >= 0);
}
if (d3 == null) {
entroct(0);
@@ -259,7 +259,7 @@ void trait_car() {
else
entroct(d3);
entroct(3);
- } while (!(i < 0));
+ } while (i >= 0);
}
entroct(0);
entroct(c2.val);
@@ -292,7 +292,7 @@ void trait_car() {
entroct(0);
entroct(d3);
entroct(3);
- } while (!(i <= 0));
+ } while (i > 0);
}
veracf(c3.acc);
if (c3.code == 6) {
@@ -345,7 +345,7 @@ void trait_car() {
entroct(d3);
entroct(c2.val);
entroct(3);
- } while (!(i <= 0));
+ } while (i > 0);
}
entroct(d3);
entroct(c2.val);
@@ -361,7 +361,7 @@ void trait_car() {
entroct(d3);
entroct(c2.val);
entroct(4);
- } while (!(i <= 0));
+ } while (i > 0);
}
}
if (c3.code == 9) {
@@ -408,7 +408,7 @@ void trait_car() {
entroct(2);
entroct(c2.val);
entroct(3);
- } while (!(i <= 0));
+ } while (i > 0);
}
entroct(2);
entroct(c2.val);
diff --git a/engines/mortevielle/parole2.cpp b/engines/mortevielle/parole2.cpp
index c493e19a79..19b44191b0 100644
--- a/engines/mortevielle/parole2.cpp
+++ b/engines/mortevielle/parole2.cpp
@@ -64,7 +64,7 @@ void trait_ph() {
WRITE_LE_UINT16(&mem[adword + ptr_word], t_cph[ptr_tcph]);
ptr_word = ptr_word + 2;
ptr_tcph = ptr_tcph + 1;
- } while (!(ptr_tcph >= (int)((uint)lefin >> 1)));
+ } while (ptr_tcph < (int)((uint)lefin >> 1));
ptr_oct = 0;
ptr_word = 0;
@@ -74,7 +74,7 @@ void trait_ph() {
rot_chariot();
charg_car();
trait_car();
- } while (!(ptr_word >= nb_word));
+ } while (ptr_word < nb_word);
rot_chariot();
trait_car();
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 07:36:23 +0000