diff options
| author | Strangerke | 2012-06-21 07:33:00 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-03-28 17:36:57 +0200 |
| commit | 1d897d7be26105d28d95ee66b2532f5433b42338 (patch) | |
| tree | d65c04dad7c41eb453bd74a63d8a6393e1e05f16 /engines/lilliput | |
| parent | f68712fbadfb23801693110c65f8ea3e9c14c6e4 (diff) | |
| download | scummvm-rg350-1d897d7be26105d28d95ee66b2532f5433b42338.tar.gz scummvm-rg350-1d897d7be26105d28d95ee66b2532f5433b42338.tar.bz2 scummvm-rg350-1d897d7be26105d28d95ee66b2532f5433b42338.zip | |
LILLIPUT: Fix a couple of errors related to the use of 0xFF instead of -1
Diffstat (limited to 'engines/lilliput')
| -rw-r--r-- | engines/lilliput/lilliput.cpp | 10 | ||||
| -rw-r--r-- | engines/lilliput/script.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp index 14b0e1c584..23d9645c01 100644 --- a/engines/lilliput/lilliput.cpp +++ b/engines/lilliput/lilliput.cpp @@ -656,7 +656,7 @@ void LilliputEngine::displayGameArea() { } void LilliputEngine::restoreMapPoints() { - debugC(2, kDebugEngineTBC, "restoreMapPoints()"); + debugC(2, kDebugEngine, "restoreMapPoints()"); restoreSurfaceUnderMousePointer(); @@ -725,10 +725,10 @@ void LilliputEngine::moveCharacters() { _scriptHandler->_characterTilePosX[i] = (_characterPositionX[i] >> 3); _scriptHandler->_characterTilePosY[i] = (_characterPositionY[i] >> 3); - _characterRelativePositionX[i] = 0xFF; - _characterRelativePositionY[i] = 0xFF; - _characterDisplayX[i] = 0xFF; - _characterDisplayY[i] = 0xFF; + _characterRelativePositionX[i] = -1; + _characterRelativePositionY[i] = -1; + _characterDisplayX[i] = -1; + _characterDisplayY[i] = -1; int tmpVal2 = (_characterPositionX[i] >> 3) - _scriptHandler->_viewportPos.x; int tmpVal3 = (_characterPositionY[i] >> 3) - _scriptHandler->_viewportPos.y; diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp index 7b461af6f2..8b5ebe3c03 100644 --- a/engines/lilliput/script.cpp +++ b/engines/lilliput/script.cpp @@ -1089,7 +1089,7 @@ void LilliputScript::checkSpeechAllowed(bool &forceReturnFl) { debugC(1, kDebugScript, "checkSpeechAllowed()"); forceReturnFl = false; - if ((!_vm->_displayMap) && (_vm->_characterRelativePositionX[_vm->_currentScriptCharacter] != 0xFF)) + if ((!_vm->_displayMap) && (_vm->_characterRelativePositionX[_vm->_currentScriptCharacter] != -1)) return; forceReturnFl = true; |