diff options
| author | Travis Howell | 2009-03-10 00:36:56 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-03-10 00:36:56 +0000 |
| commit | d666af279c8d0915ac492f75e20ed3fdd6df9636 (patch) | |
| tree | 152652e199ae218567c7711cd04ac179785e0b98 /engines/scumm | |
| parent | f2a066e42fd8da2a6924e8094e680ad61e94a9b8 (diff) | |
| download | scummvm-rg350-d666af279c8d0915ac492f75e20ed3fdd6df9636.tar.gz scummvm-rg350-d666af279c8d0915ac492f75e20ed3fdd6df9636.tar.bz2 scummvm-rg350-d666af279c8d0915ac492f75e20ed3fdd6df9636.zip | |
Alter/revert last changes to moveCamera(), as VAR_CAMERA_FAST_X is used by a few scripts in Indy3 too.
svn-id: r39285
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/camera.cpp | 9 | ||||
| -rw-r--r-- | engines/scumm/input.cpp | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/camera.cpp b/engines/scumm/camera.cpp index 5420580b47..0af1e8645e 100644 --- a/engines/scumm/camera.cpp +++ b/engines/scumm/camera.cpp @@ -105,11 +105,12 @@ void ScummEngine::moveCamera() { int pos = camera._cur.x; int t; Actor *a = NULL; + const bool snapToX = (_snapScroll || (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 (_snapScroll) + if (snapToX) camera._cur.x = (short) VAR(VAR_CAMERA_MIN_X); else camera._cur.x += 8; @@ -118,7 +119,7 @@ void ScummEngine::moveCamera() { } if (VAR_CAMERA_MAX_X != 0xFF && camera._cur.x > VAR(VAR_CAMERA_MAX_X)) { - if (_snapScroll) + if (snapToX) camera._cur.x = (short) VAR(VAR_CAMERA_MAX_X); else camera._cur.x -= 8; @@ -133,7 +134,7 @@ void ScummEngine::moveCamera() { t = actorx / 8 - _screenStartStrip; if (t < camera._leftTrigger || t > camera._rightTrigger) { - if (_snapScroll) { + if (snapToX) { if (t > 40-5) camera._dest.x = actorx + 80; if (t < 5) @@ -154,7 +155,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 (_snapScroll) { + if (snapToX) { camera._cur.x = camera._dest.x; } else { if (camera._cur.x < camera._dest.x) diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index fed41778d9..a4525ad70c 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -487,9 +487,8 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) { abortCutscene(); // VAR_CUTSCENEEXIT_KEY doesn't exist in SCUMM0 - if (VAR_CUTSCENEEXIT_KEY != 0xFF) { + if (VAR_CUTSCENEEXIT_KEY != 0xFF) _mouseAndKeyboardStat = VAR(VAR_CUTSCENEEXIT_KEY); - } } else if (snapScrollKeyEnabled && lastKeyHit.keycode == Common::KEYCODE_r && lastKeyHit.flags == Common::KBD_CTRL) { _snapScroll ^= 1; |