MORTEVIELLE: Replaced all set::of forms with proper C if statements

10 files changed, 26 insertions, 19 deletions

diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 359857eeb4..ff986a946a 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -1051,7 +1051,7 @@ L2:
 			if (x > 319)  cx = 41;
 			else cx = 1;
 			cy = succ(int, (uint)y >> 3);                  /* 0-199 => 1-25 */
-			if ((cy > 23) || ((cx == 41) && (set::of(range(20, 22), eos).has(cy)))) {
+			if ((cy > 23) || ((cx == 41) && ((cy >= 20) && (cy <= 22)))) {
 				if (choi != 0) {
 					lig = ((choi - 1) % 23) << 3;
 					if (choi > 23)  co = 320;
diff --git a/engines/mortevielle/alert.cpp b/engines/mortevielle/alert.cpp
index 1c7ae91995..d003ccbc12 100644
--- a/engines/mortevielle/alert.cpp
+++ b/engines/mortevielle/alert.cpp
@@ -151,7 +151,7 @@ int do_alert(Common::String str_, int n) {
 		do {
 			cx = 320;
 			st = "";
-			while (!(set::of('\174', '\135', eos).has(chaine[i + 1]))) {
+			while ((chaine[i + 1] != '\174') && (chaine[i + 1] != '\135')) {
 				i = i + 1;
 				st = st + chaine[i];
 				if (res == 2)  cx = cx - 3;
diff --git a/engines/mortevielle/keyboard.cpp b/engines/mortevielle/keyboard.cpp
index 44af5223a1..701f99cec7 100644
--- a/engines/mortevielle/keyboard.cpp
+++ b/engines/mortevielle/keyboard.cpp
@@ -69,7 +69,7 @@ int testou() {
 	}
 	break;
 	case '\26' :
-		if (set::of(1, 2, eos).has(c_zzz)) {
+		if ((c_zzz == 1) && (c_zzz == 2)) {
 			zzuul(adcfiec + 161, 0, 1644);
 			c_zzz = succ(int, c_zzz);
 			testou_result = 61;
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index 69fc651e70..df4085671b 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -327,7 +327,8 @@ void mdn() {
 			xprec = x;
 			yprec = y;
 		}
-		tes = (y < 11) && ((set::of(range(28 * res, 28 * res + 24), range(76 * res, 76 * res + 24), eos).has(x))
+		tes = (y < 11) && ((x >= (28 * res) && x <= (28 * res + 24)) 
+						   || (x >= (76 * res) && x <= (76 * res + 24))
 		                   || ((x > 124 * res) && (x < 124 * res + 24))
 		                   || ((x > 172 * res) && (x < 172 * res + 24))
 		                   || ((x > 220 * res) && (x < 220 * res + 24))
@@ -340,7 +341,7 @@ void mdn() {
 			else if (x < 268 * res)  ix = discut;
 			else ix = fichier;
 			if ((ix != msg3) || (! test0))
-				if (!((ix == fichier) && (set::of(sauve, charge, eos).has(msg3)))) {
+				if (!((ix == fichier) && ((msg3 == sauve) || (msg3 == charge)))) {
 					menu_up(msg3);
 					menu_down(ix);
 					msg3 = ix;
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index 195c626e95..f8454e6446 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -422,7 +422,7 @@ void repon(int f, int m) {
 				}
 			}
 		}
-		if (set::of(6, 9, eos).has(f)) {
+		if ((f >= 6) && (f <= 9)) {
 			deline(m, st, tay);
 			if (f == 6)  i = 4;
 			else i = 5;
@@ -655,7 +655,8 @@ void pendule() {
 	paint_rect(577,114,6,20);*/
 	paint_rect(570, 118, 20, 10);
 	paint_rect(578, 114, 6, 18);
-	if (set::of(cga, her, eos).has(gd))  co = 0;
+	if ((gd == cga) || (gd == her))
+		co = 0;
 	else co = 1;
 	if (min == 0)  droite(((uint)x >> 1)*res, y, ((uint)x >> 1)*res, (y - rg), co);
 	else droite(((uint)x >> 1)*res, y, ((uint)x >> 1)*res, (y + rg), co);
@@ -668,7 +669,8 @@ void pendule() {
 	if (heu > 11)  writeg("PM ", 1);
 	else writeg("AM ", 1);
 	putxy(550, 160);
-	if (set::of(range(0, 8), eos).has(jou))  writeg(string(chr(jou + 49)) + "& jour", 1);
+	if ((jou >= 0) && (jou <= 8))
+		writeg(string(chr(jou + 49)) + "& jour", 1);
 }
 
 /*************
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index adb094235b..ba0c956c1a 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -149,7 +149,8 @@ static int l_motsuiv(int p, char *ch, int &tab) {
 
 	int l_motsuiv_result;
 	c = p;
-	while (!(set::of(' ', '$', '@', eos).has(ch[p])))  p = p + 1;
+	while ((ch[p] != ' ') && (ch[p] != '$') && (ch[p] != '@'))
+		++p;
 	l_motsuiv_result = tab * (p - c);
 	return l_motsuiv_result;
 }
diff --git a/engines/mortevielle/ovd1.cpp b/engines/mortevielle/ovd1.cpp
index 09855440e5..906600f44c 100644
--- a/engines/mortevielle/ovd1.cpp
+++ b/engines/mortevielle/ovd1.cpp
@@ -231,7 +231,7 @@ void ani50() {
 	output << "Ctrl       C      E            H             T           A";
 	do {
 		input >> kbd >> ch;
-	} while (!(set::of('\1', '\3', '\5', '\24', '\10', eos).has(ch)));
+	} while ((ch != '\1') && (ch != '\3') && (ch != '\5') && (ch != '\24') && (ch != '\10'));
 	switch (ch) {
 	case '\1':
 	case '\3':
@@ -258,7 +258,7 @@ void ani50() {
 	output << 'S';
 	do {
 		input >> kbd >> ch;
-	} while (!(set::of('C', 'S', eos).has(upcase(ch))));
+	} while ((ch != 'C') && (ch != 'S'));
 	int_m = (upcase(ch) == 'S');
 }
 
@@ -361,7 +361,8 @@ void ani50() {
 	gotoxy(20 * pred(int, res) + 8, 24);
 	textcolor(7);
 	cpr = "COPYRIGHT 1989 : LANKHOR";
-	if (set::of(ega, ams, cga, eos).has(gd))  output << cpr;
+	if ((gd == ega) || (gd == ams) || (gd == cga))
+		output << cpr;
 	else {
 		putxy(104 + 72 * res, 190);
 		writeg(cpr, 0);
diff --git a/engines/mortevielle/parole.cpp b/engines/mortevielle/parole.cpp
index c2c9222592..6c8f598fd4 100644
--- a/engines/mortevielle/parole.cpp
+++ b/engines/mortevielle/parole.cpp
@@ -32,8 +32,8 @@ namespace Mortevielle {
 void spfrac(int wor) {
 	c3.rep = (uint)wor >> 12;
 	if ((typlec == 0) && (c3.code != 9))
-		if (((c3.code > 4) && (c3.val != 20) && !(set::of(3, 6, 9, eos).has(c3.rep))) ||
-		        ((c3.code < 5) && !(set::of(19, 22, eos).has(c3.val)) && !(set::of(4, 9, eos).has(c3.rep))))
+		if (((c3.code > 4) && (c3.val != 20) && ((c3.rep != 3) && (c3.rep != 6) && (c3.rep != 9)) ||
+				((c3.code < 5) && ((c3.rep != 19) && (c3.rep != 22) && (c3.rep != 4) && (c3.rep != 9))))) {
 			c3.rep = c3.rep + 1;
 	c3.freq = ((uint)wor >> 6) & 7;
 	c3.acc = ((uint)wor >> 9) & 7;
@@ -346,7 +346,7 @@ void veracf(byte b) {
 			entroct(d3);
 			entroct(c2.val);
 			entroct(5);
-		} else if (!(set::of(range(0, 1), 4, eos).has(c3.code))) {
+		} else if ((c3.code != 0) && (c3.code != 1) && (c3.code != 4)) {
 			veracf(c3.acc);
 			switch (c3.code) {
 			case 3 :
@@ -388,7 +388,7 @@ void veracf(byte b) {
 			entroct(2);
 			entroct(c2.val);
 			entroct(5);
-		} else if (!(set::of(range(0, 1), 4, eos).has(c3.code))) {
+		} else if ((c3.code != 0) && (c3.code != 1) && (c3.code != 4)) {
 			veracf(c3.acc);
 			switch (c3.code) {
 			case 3 :
diff --git a/engines/mortevielle/prog.cpp b/engines/mortevielle/prog.cpp
index f7f1e0e818..d5004cdec8 100644
--- a/engines/mortevielle/prog.cpp
+++ b/engines/mortevielle/prog.cpp
@@ -267,7 +267,7 @@ void tecran() {
 
 		erase_menu();
 		imen = false;
-		if (set::of('\1', '\3', '\5', '\7', '\11', eos).has(inkey)) {
+		if ((inkey == '\1') || (inkey == '\3') || (inkey == '\5') || (inkey == '\7') || (inkey == '\11')) {
 			change_gd((uint)pred(int, ord(inkey)) >> 1);
 			return;
 		}
diff --git a/engines/mortevielle/taffich.cpp b/engines/mortevielle/taffich.cpp
index 85b2157b6e..6d6df692cd 100644
--- a/engines/mortevielle/taffich.cpp
+++ b/engines/mortevielle/taffich.cpp
@@ -109,8 +109,10 @@ void taffich() {
 
 
 	a = caff;
-	if (set::of(range(153, 161), eos).has(a))  a = tran2[a];
-	else if (set::of(range(136, 140), eos).has(a))  a = tran1[a];
+	if ((a >= 153) && (a <= 161))
+		a = tran2[a];
+	else if ((a >= 136) && (a <= 140))
+		a = tran1[a];
 	b = a;
 	if (maff == a)  return;
 	if (a == 16) {