diff options
author | Max Horn | 2004-08-14 15:23:44 +0000 |
---|---|---|
committer | Max Horn | 2004-08-14 15:23:44 +0000 |
commit | 171fac3895ccc4b91ec8e5be6880847a26696390 (patch) | |
tree | efbfa62ec57fa70d6114090547f3304361f862d8 /scumm | |
parent | 239aa2b0629f4499279f79d52a2c955a9c17877f (diff) | |
download | scummvm-rg350-171fac3895ccc4b91ec8e5be6880847a26696390.tar.gz scummvm-rg350-171fac3895ccc4b91ec8e5be6880847a26696390.tar.bz2 scummvm-rg350-171fac3895ccc4b91ec8e5be6880847a26696390.zip |
Get rid of _screenLeft
svn-id: r14608
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/camera.cpp | 7 | ||||
-rw-r--r-- | scumm/scumm.cpp | 1 | ||||
-rw-r--r-- | scumm/scumm.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scumm/camera.cpp b/scumm/camera.cpp index d181a53ee9..b5770276c6 100644 --- a/scumm/camera.cpp +++ b/scumm/camera.cpp @@ -314,6 +314,7 @@ void ScummEngine_v7::moveCamera() { void ScummEngine::cameraMoved() { + int screenLeft; if (_features & GF_NEW_CAMERA) { assert(camera._cur.x >= (_screenWidth / 2) && camera._cur.y >= (_screenHeight / 2)); } else { @@ -329,13 +330,13 @@ void ScummEngine::cameraMoved() { _screenTop = camera._cur.y - (_screenHeight / 2); if (_features & GF_NEW_CAMERA) { - _screenLeft = camera._cur.x - (_screenWidth / 2); + screenLeft = camera._cur.x - (_screenWidth / 2); } else { - _screenLeft = _screenStartStrip * 8; + screenLeft = _screenStartStrip * 8; } #ifdef V7_SMOOTH_SCROLLING_HACK - virtscr[0].xstart = _screenLeft; + virtscr[0].xstart = screenLeft; #else virtscr[0].xstart = _screenStartStrip * 8; #endif diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 4a04a78bff..965f0c72c5 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -582,7 +582,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _shakeFrame = 0; _screenStartStrip = 0; _screenEndStrip = 0; - _screenLeft = 0; _screenTop = 0; _blastObjectQueuePos = 0; memset(_blastObjectQueue, 0, sizeof(_blastObjectQueue)); diff --git a/scumm/scumm.h b/scumm/scumm.h index a0d98f9039..9ed637b04b 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -986,7 +986,7 @@ protected: public: int _screenStartStrip, _screenEndStrip; - int _screenLeft, _screenTop; + int _screenTop; protected: int _blastObjectQueuePos; |