aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/gfx.cpp2
-rw-r--r--scumm/object.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index d96ff6bc91..ef6127b5d2 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -1219,7 +1219,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi
sx = 0;
}
- while (numstrip && sx < _numStrips && x * 8 < MAX(_vm->_roomWidth, (int) vs->w)) {
+ while (numstrip && sx < _numStrips && x * 8 < width) {
CHECK_HEAP;
if (y < vs->tdirty[sx])
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 84ce62fef0..d6328d4ce0 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, width * 8, height, x - xpos, numstrip, flags);
+ gdi.drawBitmap(ptr, &virtscr[0], x, ypos, _roomWidth, height, x - xpos, numstrip, flags);
}
}