diff options
| author | Travis Howell | 2004-09-27 07:32:49 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-09-27 07:32:49 +0000 |
| commit | 993ac60b9b7743f626edeca9146705ec2c75f7ec (patch) | |
| tree | a9e38b4003ce067616e846537240dc71cedaeb97 | |
| parent | 9df6b709908f7ab744ceb61ea1693f0ec546026c (diff) | |
| download | scummvm-rg350-993ac60b9b7743f626edeca9146705ec2c75f7ec.tar.gz scummvm-rg350-993ac60b9b7743f626edeca9146705ec2c75f7ec.tar.bz2 scummvm-rg350-993ac60b9b7743f626edeca9146705ec2c75f7ec.zip | |
Revert, just made matters worse.
svn-id: r15306
| -rw-r--r-- | scumm/gfx.cpp | 3 | ||||
| -rw-r--r-- | scumm/object.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index ef6127b5d2..1911347cdd 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -1219,7 +1219,8 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi sx = 0; } - while (numstrip && sx < _numStrips && x * 8 < width) { + // FIXME Still not been calculated correctly + while (numstrip && sx < _numStrips && x * 8 < MAX(_vm->_roomWidth, (int) vs->w)) { CHECK_HEAP; if (y < vs->tdirty[sx]) diff --git a/scumm/object.cpp b/scumm/object.cpp index d6328d4ce0..84ce62fef0 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -495,7 +495,7 @@ void ScummEngine::drawObject(int obj, int arg) { if (_heversion >= 70 && findResource(MKID('SMAP'), ptr) == NULL) gdi.drawBMAPObject(ptr, &virtscr[0], obj, od.x_pos * 8, od.y_pos * 8, od.width * 8, od.height * 8); else - gdi.drawBitmap(ptr, &virtscr[0], x, ypos, _roomWidth, height, x - xpos, numstrip, flags); + gdi.drawBitmap(ptr, &virtscr[0], x, ypos, width * 8, height, x - xpos, numstrip, flags); } } |