MORTEVIELLE: Double check all "in []" statements, fix a couple of errors

scummvm · Apr 6, 2012 · 9751829 · 9751829
1 parent 97de41b
commit 9751829
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
@@ -371,7 +371,7 @@ void repon(int f, int m) {
 				}
 			}
 		}
-		if ((f >= 6) && (f <= 9)) {
+		if ((f == 6) || (f == 9)) {
 			if (f == 6)
 				i = 4;
 			else
@@ -615,6 +615,10 @@ void chlm(int &per) {
 	if (per == 2)  per = 128;
 }
 
+/**
+ * Engine function - Draw Clock
+ * @remarks	Originally called 'pendule'
+ */
 void drawClock() {
 	const int cv[3][13] = {
 		{ 0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0 },

diff --git a/engines/mortevielle/parole.cpp b/engines/mortevielle/parole.cpp
@@ -36,7 +36,7 @@ void spfrac(int wor) {
 	c3.rep = (uint)wor >> 12;
 	if ((typlec == 0) && (c3.code != 9))
 		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.code < 5) && ((c3.val != 19) && (c3.val != 22) && (c3.rep != 4) && (c3.rep != 9))))) {
 			++c3.rep;
 		}