diff options
| author | Max Horn | 2004-09-25 17:46:23 +0000 |
|---|---|---|
| committer | Max Horn | 2004-09-25 17:46:23 +0000 |
| commit | a7406555d802ac2230503f76586b7606306580c5 (patch) | |
| tree | 379e604ab30244bf90250a996ed1ee28b60dff7e | |
| parent | 5c146947ccb4603fffeac4f7b9af970939005cd1 (diff) | |
| download | scummvm-rg350-a7406555d802ac2230503f76586b7606306580c5.tar.gz scummvm-rg350-a7406555d802ac2230503f76586b7606306580c5.tar.bz2 scummvm-rg350-a7406555d802ac2230503f76586b7606306580c5.zip | |
Cleanup / correction
svn-id: r15272
| -rw-r--r-- | scumm/gfx.cpp | 6 | ||||
| -rw-r--r-- | scumm/scumm.h | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 72fd1e4ef0..93150c279d 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -1176,11 +1176,13 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi if (_vm->_features & GF_SMALL_HEADER) { smap_ptr = ptr; } else if (_vm->_version == 8) { - // Skip to the skip to the BSTR->WRAP->OFFS chunk + // Skip to the BSTR->WRAP->OFFS chunk smap_ptr = ptr + 24; } else smap_ptr = _vm->findResource(MKID('SMAP'), ptr); +Common::hexdump(smap_ptr - 24, 48); + if (!smap_ptr) { // This will go away eventually. HE 7.2 titles used different function // here which read BMAP. But it was replaced not in every place. So @@ -1219,7 +1221,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi sx = 0; } - while (numstrip && sx < _numStrips && x * 8 < _vm->_roomWidth) { + while (numstrip && sx < _numStrips && x * 8 < width) { CHECK_HEAP; if (y < vs->tdirty[sx]) diff --git a/scumm/scumm.h b/scumm/scumm.h index 729c903910..b0ca63b037 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -900,11 +900,6 @@ public: protected: /* Should be in Graphics class? */ uint16 _screenB, _screenH; - -//#ifdef V7_SMOOTH_SCROLLING_HACK -//(see gfx.cpp line 1222) -public: // HACK HACK HACK -//#endif int _roomHeight, _roomWidth; public: int _screenHeight, _screenWidth; |