diff options
| author | Max Horn | 2003-05-08 15:58:30 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-08 15:58:30 +0000 |
| commit | 0461222181d648c90e9dbd493909a2ff9b0e800b (patch) | |
| tree | 56dbb0600f26b2d2efc427ad6d80ff32118acb88 /scumm/gfx.cpp | |
| parent | 98881c3a6a513c27a06e596c29e0b40b355844f6 (diff) | |
| download | scummvm-rg350-0461222181d648c90e9dbd493909a2ff9b0e800b.tar.gz scummvm-rg350-0461222181d648c90e9dbd493909a2ff9b0e800b.tar.bz2 scummvm-rg350-0461222181d648c90e9dbd493909a2ff9b0e800b.zip | |
fixed various cases of bad var access
svn-id: r7394
Diffstat (limited to 'scumm/gfx.cpp')
| -rw-r--r-- | scumm/gfx.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index e0b50e1966..f3d2491e48 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -2145,7 +2145,7 @@ void Scumm::moveCamera() { camera._cur.x &= 0xFFF8; if (camera._cur.x < VAR(VAR_CAMERA_MIN_X)) { - if (VAR(VAR_CAMERA_FAST_X)) + if (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X)) camera._cur.x = VAR(VAR_CAMERA_MIN_X); else camera._cur.x += 8; @@ -2154,7 +2154,7 @@ void Scumm::moveCamera() { } if (camera._cur.x > VAR(VAR_CAMERA_MAX_X)) { - if (VAR(VAR_CAMERA_FAST_X)) + if (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X)) camera._cur.x = VAR(VAR_CAMERA_MAX_X); else camera._cur.x -= 8; @@ -2169,7 +2169,7 @@ void Scumm::moveCamera() { t = (actorx >> 3) - _screenStartStrip; if (t < camera._leftTrigger || t > camera._rightTrigger) { - if (VAR(VAR_CAMERA_FAST_X)) { + if (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X)) { if (t > 35) camera._dest.x = actorx + 80; if (t < 5) @@ -2190,7 +2190,7 @@ void Scumm::moveCamera() { if (camera._dest.x > VAR(VAR_CAMERA_MAX_X)) camera._dest.x = VAR(VAR_CAMERA_MAX_X); - if (VAR(VAR_CAMERA_FAST_X)) { + if (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X)) { camera._cur.x = camera._dest.x; } else { if (camera._cur.x < camera._dest.x) |