diff options
| author | sylvaintv | 2012-04-25 23:51:45 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-03-28 17:36:57 +0200 |
| commit | 0be54f0b1b7ade28763ca93f59d30a22801cf946 (patch) | |
| tree | bdbd2fb8626f23019a18d243aae2e1ba80ecbd4d /engines/lilliput/lilliput.cpp | |
| parent | 5ede42cd6a9987faf2583bfe91fb11e1c563f4de (diff) | |
| download | scummvm-rg350-0be54f0b1b7ade28763ca93f59d30a22801cf946.tar.gz scummvm-rg350-0be54f0b1b7ade28763ca93f59d30a22801cf946.tar.bz2 scummvm-rg350-0be54f0b1b7ade28763ca93f59d30a22801cf946.zip | |
LILLIPUT: Maybe fix a problem in sub12F37
Unlocked new opcodes !
Diffstat (limited to 'engines/lilliput/lilliput.cpp')
| -rw-r--r-- | engines/lilliput/lilliput.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp index 6953ea3e46..7c7f9a84f4 100644 --- a/engines/lilliput/lilliput.cpp +++ b/engines/lilliput/lilliput.cpp @@ -1346,12 +1346,15 @@ void LilliputEngine::sub12F37() { int index2 = 0; for (int i = 0; i < _word10807_ERULES; i++) { - if (_rulesBuffer2_15[index1] == 1 ) { - --_rulesBuffer2_15[index1]; - if (_rulesBuffer2_15[index1] == 1) - _scriptHandler->_array10B29[index2] = 1; - } else - _rulesBuffer2_15[index1] = 0; + if (_rulesBuffer2_15[index1] != 0 ) { + if (_rulesBuffer2_15[index1] == 1) { + _rulesBuffer2_15[index1] = 0; + } else { + --_rulesBuffer2_15[index1]; + if (_rulesBuffer2_15[index1] == 1) + _scriptHandler->_array10B29[index2] = 1; + } + } index1 += 32; ++index2; @@ -1610,23 +1613,23 @@ void LilliputEngine::displayHeroismIndicator() { int var1 = (_scriptHandler->_savedBuffer215Ptr[0] * 25) >> 8; - if (var1 == _scriptHandler->_byte15FFA) + if (var1 == _scriptHandler->_heroismLevel) return; displayFunction5(); int var2 = 1; - if (var1 > _scriptHandler->_byte15FFA) + if (var1 > _scriptHandler->_heroismLevel) var1 = 150; else { var2 = -1; var1 = 40; } - _scriptHandler->_byte15FFA += var2; - - int index = _scriptHandler->_word15FFB + _scriptHandler->_word15FFD * 320 ; + _scriptHandler->_heroismLevel += var2; + + int index = _scriptHandler->_heroismBarX + _scriptHandler->_heroismBarBottomY * 320 ; - var2 = _scriptHandler->_byte15FFA & 0xFF; + var2 = _scriptHandler->_heroismLevel & 0xFF; if (var2 != 0) { // sub16064(var1, _scriptHandler->_byte15FFA); for (int i = 0; i < (var2 << 2); i++) { @@ -1637,9 +1640,9 @@ void LilliputEngine::displayHeroismIndicator() { } } - if (25 - _scriptHandler->_byte15FFA != 0) { + if (25 - _scriptHandler->_heroismLevel != 0) { // sub16064(23, 25 - _scriptHandler->_byte15FFA); - var2 = (25 - _scriptHandler->_byte15FFA) << 2; + var2 = (25 - _scriptHandler->_heroismLevel) << 2; for (int i = 0; i < var2; i++) { ((byte *)_mainSurface->getPixels())[index] = 23; ((byte *)_mainSurface->getPixels())[index + 1] = 23; |