diff options
Diffstat (limited to 'engines/scumm/camera.cpp')
| -rw-r--r-- | engines/scumm/camera.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/scumm/camera.cpp b/engines/scumm/camera.cpp index 524e9e78eb..5420580b47 100644 --- a/engines/scumm/camera.cpp +++ b/engines/scumm/camera.cpp @@ -105,12 +105,11 @@ void ScummEngine::moveCamera() { int pos = camera._cur.x; int t; Actor *a = NULL; - const bool snapToX = (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X)); camera._cur.x &= 0xFFF8; if (VAR_CAMERA_MIN_X != 0xFF && camera._cur.x < VAR(VAR_CAMERA_MIN_X)) { - if (snapToX) + if (_snapScroll) camera._cur.x = (short) VAR(VAR_CAMERA_MIN_X); else camera._cur.x += 8; @@ -119,7 +118,7 @@ void ScummEngine::moveCamera() { } if (VAR_CAMERA_MAX_X != 0xFF && camera._cur.x > VAR(VAR_CAMERA_MAX_X)) { - if (snapToX) + if (_snapScroll) camera._cur.x = (short) VAR(VAR_CAMERA_MAX_X); else camera._cur.x -= 8; @@ -134,7 +133,7 @@ void ScummEngine::moveCamera() { t = actorx / 8 - _screenStartStrip; if (t < camera._leftTrigger || t > camera._rightTrigger) { - if (snapToX) { + if (_snapScroll) { if (t > 40-5) camera._dest.x = actorx + 80; if (t < 5) @@ -155,7 +154,7 @@ void ScummEngine::moveCamera() { if (VAR_CAMERA_MAX_X != 0xFF && camera._dest.x > VAR(VAR_CAMERA_MAX_X)) camera._dest.x = (short) VAR(VAR_CAMERA_MAX_X); - if (snapToX) { + if (_snapScroll) { camera._cur.x = camera._dest.x; } else { if (camera._cur.x < camera._dest.x) |