diff options
| author | Strangerke | 2012-02-29 19:28:56 +0100 |
|---|---|---|
| committer | Strangerke | 2012-04-06 08:22:16 +0200 |
| commit | 10132f3632ecb86ba928db3d1510d5ac16eb5529 (patch) | |
| tree | 84ea021e60f33476410aba641c9ab57d43d2310a /engines | |
| parent | e26a93efdf9b128ac8ed721460efe94966ae5f2c (diff) | |
| download | scummvm-rg350-10132f3632ecb86ba928db3d1510d5ac16eb5529.tar.gz scummvm-rg350-10132f3632ecb86ba928db3d1510d5ac16eb5529.tar.bz2 scummvm-rg350-10132f3632ecb86ba928db3d1510d5ac16eb5529.zip | |
MORTEVIELLE: Double check all "in []" statements, fix a couple of errors
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mortevielle/mor.cpp | 6 | ||||
| -rw-r--r-- | engines/mortevielle/parole.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp index 10f0194bf9..97b116f869 100644 --- 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 index e86b647f36..791bfd7d61 100644 --- 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; } |