thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert, just made matters worse.

Browse source 
svn-id: r15306
This commit is contained in:
Travis Howell 2004-09-27 07:32:49 +00:00
parent 9df6b70990
commit 993ac60b9b
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scumm/gfx.cpp
View file

@ -1219,7 +1219,8 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi
sx = 0; 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; CHECK_HEAP;
if (y < vs->tdirty[sx]) if (y < vs->tdirty[sx])

2
scumm/object.cpp
View file

@ -495,7 +495,7 @@ void ScummEngine::drawObject(int obj, int arg) {
if (_heversion >= 70 && findResource(MKID('SMAP'), ptr) == NULL) 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); gdi.drawBMAPObject(ptr, &virtscr[0], obj, od.x_pos * 8, od.y_pos * 8, od.width * 8, od.height * 8);
else 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);
} }
} }