diff options
| author | Travis Howell | 2004-07-22 04:37:20 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-07-22 04:37:20 +0000 |
| commit | 6a1800a2cd9d5c337307a06767e494b16af6e244 (patch) | |
| tree | c3a9fe33ce5fa1b03afa34b1e3d05d21eeb10fb7 | |
| parent | e133de4d515033defc056375f0a93a6a33cae549 (diff) | |
| download | scummvm-rg350-6a1800a2cd9d5c337307a06767e494b16af6e244.tar.gz scummvm-rg350-6a1800a2cd9d5c337307a06767e494b16af6e244.tar.bz2 scummvm-rg350-6a1800a2cd9d5c337307a06767e494b16af6e244.zip | |
Remove unused code, VAR_SCROLL_SCRIPT is never set for scumm 1/2.
svn-id: r14298
| -rw-r--r-- | scumm/camera.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/scumm/camera.cpp b/scumm/camera.cpp index 5fb48ee8e4..d181a53ee9 100644 --- a/scumm/camera.cpp +++ b/scumm/camera.cpp @@ -49,10 +49,7 @@ void ScummEngine::setCameraAt(int pos_x, int pos_y) { camera._cur.x = (short) VAR(VAR_CAMERA_MAX_X); if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT)) { - if (_version <= 2) - VAR(VAR_CAMERA_POS_X) = camera._cur.x / 8; - else - VAR(VAR_CAMERA_POS_X) = camera._cur.x; + VAR(VAR_CAMERA_POS_X) = camera._cur.x; runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0); } @@ -226,10 +223,7 @@ void ScummEngine::moveCamera() { cameraMoved(); if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT) && pos != camera._cur.x) { - if (_version <= 2) - VAR(VAR_CAMERA_POS_X) = camera._cur.x / 8; - else - VAR(VAR_CAMERA_POS_X) = camera._cur.x; + VAR(VAR_CAMERA_POS_X) = camera._cur.x; runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0); } } |