diff options
author | Strangerke | 2012-05-26 11:07:15 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2018-03-28 17:36:57 +0200 |
commit | 4d36343b0c9cc5f0789507f732a66e1742acfb4f (patch) | |
tree | ae738526469bc51547493a6c893bbd79479b989a /engines/lilliput/lilliput.cpp | |
parent | 5498523326c804ac042e3daa4a91c74aaee56e45 (diff) | |
download | scummvm-rg350-4d36343b0c9cc5f0789507f732a66e1742acfb4f.tar.gz scummvm-rg350-4d36343b0c9cc5f0789507f732a66e1742acfb4f.tar.bz2 scummvm-rg350-4d36343b0c9cc5f0789507f732a66e1742acfb4f.zip |
LILLIPUT: Fix bug in viewportScrollTo(), some renaming
Diffstat (limited to 'engines/lilliput/lilliput.cpp')
-rw-r--r-- | engines/lilliput/lilliput.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp index a97f77c9fc..fb05e1c356 100644 --- a/engines/lilliput/lilliput.cpp +++ b/engines/lilliput/lilliput.cpp @@ -1246,12 +1246,12 @@ void LilliputEngine::scrollToViewportCharacterTarget() { } void LilliputEngine::viewportScrollTo(Common::Point goalPos) { - debugC(2, kDebugEngineTBC, "viewportScrollTo(%d, %d)", goalPos.x, goalPos.y); + debugC(2, kDebugEngine, "viewportScrollTo(%d, %d)", goalPos.x, goalPos.y); if (goalPos == _scriptHandler->_viewportPos) return; - int dx = 0; + int16 dx = 0; if (goalPos.x != _scriptHandler->_viewportPos.x) { if (goalPos.x < _scriptHandler->_viewportPos.x) --dx; @@ -1259,7 +1259,7 @@ void LilliputEngine::viewportScrollTo(Common::Point goalPos) { ++dx; } - int dy = 0; + int16 dy = 0; if (goalPos.y != _scriptHandler->_viewportPos.y) { if (goalPos.y < _scriptHandler->_viewportPos.y) --dy; @@ -1280,7 +1280,7 @@ void LilliputEngine::viewportScrollTo(Common::Point goalPos) { if (goalPos.y == _scriptHandler->_viewportPos.y) dy = 0; - } while ((dx != 0) && (dy != 0)); + } while ((dx != 0) || (dy != 0)); _soundHandler->contentFct5(); } |