diff options
| author | Max Horn | 2003-01-12 13:58:16 +0000 |
|---|---|---|
| committer | Max Horn | 2003-01-12 13:58:16 +0000 |
| commit | aa60f424bacaffe6c8d75703ec0ce267e0d75e26 (patch) | |
| tree | 88f86c7a06df980b3619e54a8f5e1caa7aecc69d | |
| parent | 5db47f56d0cd3bcfd8a62d6c81027777af16eb8e (diff) | |
| download | scummvm-rg350-aa60f424bacaffe6c8d75703ec0ce267e0d75e26.tar.gz scummvm-rg350-aa60f424bacaffe6c8d75703ec0ce267e0d75e26.tar.bz2 scummvm-rg350-aa60f424bacaffe6c8d75703ec0ce267e0d75e26.zip | |
fix banjo duel crash
svn-id: r6427
| -rw-r--r-- | scumm/gfx.cpp | 1 | ||||
| -rw-r--r-- | scumm/object.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 04deb08954..1d55780bcf 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -851,6 +851,7 @@ byte Scumm::isMaskActiveAt(int l, int t, int r, int b, byte *mem) void Gdi::drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, const int h, int stripnr, int numstrip, byte flag) { + assert(h > 0); byte *backbuff_ptr, *bgbak_ptr, *smap_ptr; int i; byte *zplane_list[9]; diff --git a/scumm/object.cpp b/scumm/object.cpp index 6054f4a41a..c5d1c042bb 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -356,7 +356,7 @@ void Scumm::drawObject(int obj, int arg) ypos = od->y_pos; width = od->width >> 3; - height = od->height &= 0xF8; // Ender + height = od->height &= 0xFFFFFFF8; // Mask out last 3 bits if (width == 0 || xpos > _screenEndStrip || xpos + width < _screenStartStrip) return; |