Get rid of _screenLeft

svn-id: r14608
This commit is contained in:
Max Horn 2004-08-14 15:23:44 +00:00
parent 239aa2b062
commit 171fac3895
3 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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));

View File

@ -986,7 +986,7 @@ protected:
public:
int _screenStartStrip, _screenEndStrip;
int _screenLeft, _screenTop;
int _screenTop;
protected:
int _blastObjectQueuePos;