diff options
| author | Strangerke | 2012-04-23 20:36:18 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-03-28 17:36:57 +0200 |
| commit | 8d5c377b45fe929afec3af83619c669193808556 (patch) | |
| tree | d817c3702a07334c07ef0c5cdad017aaec172029 /engines/lilliput | |
| parent | 98b39800a86f4fba98e6cb2b1e04b247a1e7c977 (diff) | |
| download | scummvm-rg350-8d5c377b45fe929afec3af83619c669193808556.tar.gz scummvm-rg350-8d5c377b45fe929afec3af83619c669193808556.tar.bz2 scummvm-rg350-8d5c377b45fe929afec3af83619c669193808556.zip | |
LILLIPUT: (Hopefully) fix sub16CA0
Diffstat (limited to 'engines/lilliput')
| -rw-r--r-- | engines/lilliput/lilliput.cpp | 126 |
1 files changed, 58 insertions, 68 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp index ecefbdcd98..1ee731606c 100644 --- a/engines/lilliput/lilliput.cpp +++ b/engines/lilliput/lilliput.cpp @@ -699,101 +699,91 @@ int LilliputEngine::sub16DD5(int x1, int y1, int x2, int y2) } void LilliputEngine::sub16CA0() { - + debugC(2, kDebugEngine, "sub16CA0()"); for (int index = _word10807_ERULES - 1; index >= 0; index--) { if (_rulesBuffer2_11[index] & 1) continue; + int c1 = _scriptHandler->_array16123[index]; int c2 = _scriptHandler->_array1614B[index]; for(int index2 = _word10807_ERULES - 1; index2 >= 0; index2--) { - if ( index == index2 ) - continue; - - if (_rulesBuffer2_5[index] != index2 && - _rulesBuffer2_5[index2] != index && + _byte16C9F = 0; + if ((index != index2 ) && + (_rulesBuffer2_5[index] != index2) && + (_rulesBuffer2_5[index2] != index) && (_rulesBuffer2_11[index2] & 2) == 0) { int d1 = _scriptHandler->_array16123[index2]; int d2 = _scriptHandler->_array1614B[index2]; - + if (d1 != 0xFF) { int x = c1 - d1; - if (x > -6 && x < 6) { + if ((x > -6) && (x < 6)) { int y = c2 - d2; - if (y > -6 && y < 6) { + if ((y > -6) && (y < 6)) { _byte16C9F = 1; - - if (c1 == d1 && c2 == d2) { + + if ((c1 == d1) && (c2 == d2)) { _byte16C9F = 4; - } - else { - if((_rulesBuffer2_11[index] & 4) == 0) { - if (_rulesBuffer2_9[index] == 0) { - if (d1 > c1) { - _byte16C9F = 2; - if (d2 == c2) { - _byte16C9F = 3; - } else { - if (sub16DD5(c1,d1,c2,d2)) { - _byte16C9F = 1; - } - } - } + } else if((_rulesBuffer2_11[index] & 4) != 0) { + _byte16C9F = 0; + } else { + if (_rulesBuffer2_9[index] == 0) { + if (d1 > c1) { + _byte16C9F = 2; + + if (d2 == c2) + _byte16C9F = 3; + + if (sub16DD5(c1, d1, c2, d2) != 0) + _byte16C9F = 1; } - else if (_rulesBuffer2_9[index] == 1) { - if (d2 < c2) { - _byte16C9F = 2; - if(d1 == c1) { - _byte16C9F = 3; - } else { - if (sub16DD5(c1,d1,c2,d2)) { - _byte16C9F = 1; - } - } - } + } else if (_rulesBuffer2_9[index] == 1) { + if (d2 < c2) { + _byte16C9F = 2; + + if(d1 == c1) + _byte16C9F = 3; + + if (sub16DD5(c1, d1, c2, d2) != 0) + _byte16C9F = 1; } - else if (_rulesBuffer2_9[index] == 2) { - if (d2 > c2) { - _byte16C9F = 2; - if(d1 == c1) { - _byte16C9F = 3; - } else { - if (sub16DD5(c1,d1,c2,d2)) { - _byte16C9F = 1; - } - } - } - } - else { - if (d1 < c1) { - _byte16C9F = 2; - if (d2 == c2) { - _byte16C9F = 3; - } else { - if (sub16DD5(c1,d1,c2,d2)) { - _byte16C9F = 1; - } - } - } + } else if (_rulesBuffer2_9[index] == 2) { + if (d2 > c2) { + _byte16C9F = 2; + + if(d1 == c1) + _byte16C9F = 3; + + if (sub16DD5(c1, d1, c2, d2) != 0) + _byte16C9F = 1; } + } else { + if (d1 < c1) { + _byte16C9F = 2; - + if (d2 == c2) + _byte16C9F = 3; + + if (sub16DD5(c1, d1, c2, d2) != 0) + _byte16C9F = 1; + } } } } } } - - int val = _scriptHandler->_array10B51[index2 + index * 40]; - val = (val & 0xFF) + ((val & 0xFF) << 8); - if( (val & 0xFF) != _byte16C9F ) { - _scriptHandler->_array10B29[index] = 1; - val = (val & 0xFF00) | _byte16C9F; - } - _scriptHandler->_array10B51[index2 + index * 40] = val; } + int val = _scriptHandler->_array10B51[index2 + index * 40]; + val = (val & 0xFF) + ((val & 0xFF) << 8); + if( (val & 0xFF) != _byte16C9F ) { + _scriptHandler->_array10B29[index] = 1; + val = (val & 0xFF00) | _byte16C9F; + } + _scriptHandler->_array10B51[index2 + index * 40] = val; + } } |