diff options
| author | Travis Howell | 2004-09-25 23:14:09 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-09-25 23:14:09 +0000 |
| commit | db00315d5ba6d69e8db72d8e0e5631b657825835 (patch) | |
| tree | 6872f0960db4f78580a3f5c9bd7f2a1c15e39c9d | |
| parent | d10dc2a3d0a4d7d8e79799737e1c5948fcecf26c (diff) | |
| download | scummvm-rg350-db00315d5ba6d69e8db72d8e0e5631b657825835.tar.gz scummvm-rg350-db00315d5ba6d69e8db72d8e0e5631b657825835.tar.bz2 scummvm-rg350-db00315d5ba6d69e8db72d8e0e5631b657825835.zip | |
Revert change, breaks draw of objects.
svn-id: r15276
| -rw-r--r-- | scumm/gfx.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index b11f2fae74..e02ad79d91 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -1210,7 +1210,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi sx = 0; } - while (numstrip && sx < _numStrips && x * 8 < width) { + while (numstrip && sx < _numStrips && x * 8 < _vm->_roomWidth) { CHECK_HEAP; if (y < vs->tdirty[sx]) diff --git a/scumm/scumm.h b/scumm/scumm.h index b0ca63b037..02368f12c0 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -900,8 +900,8 @@ public: protected: /* Should be in Graphics class? */ uint16 _screenB, _screenH; - int _roomHeight, _roomWidth; public: + int _roomHeight, _roomWidth; int _screenHeight, _screenWidth; VirtScreen virtscr[4]; // Virtual screen areas CameraData camera; // 'Camera' - viewport |