diff options
| author | Max Horn | 2010-08-23 10:00:19 +0000 |
|---|---|---|
| committer | Max Horn | 2010-08-23 10:00:19 +0000 |
| commit | 7a125f85fef404b9e3af2db5ddd26eff96c25a00 (patch) | |
| tree | 7249f989444dc249bd9a70525ef63c67f6caaa13 /engines/scumm | |
| parent | f960f5da2345986ee76a46d923cce22be1bb9ce3 (diff) | |
| download | scummvm-rg350-7a125f85fef404b9e3af2db5ddd26eff96c25a00.tar.gz scummvm-rg350-7a125f85fef404b9e3af2db5ddd26eff96c25a00.tar.bz2 scummvm-rg350-7a125f85fef404b9e3af2db5ddd26eff96c25a00.zip | |
SCUMM: cleanup
svn-id: r52295
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/gfx.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index 7b0d4909d6..77c52d9dc7 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -1794,18 +1794,16 @@ bool Gdi::drawStrip(byte *dstPtr, VirtScreen *vs, int x, int y, const int width, if (stripnr * 2 + 2 < smapLen) { offset = READ_LE_UINT16(smap_ptr + stripnr * 2 + 2); } - assertRange(0, offset, smapLen-1, "screen strip"); } else if (_vm->_game.features & GF_SMALL_HEADER) { smapLen = READ_LE_UINT32(smap_ptr); if (stripnr * 4 + 4 < smapLen) offset = READ_LE_UINT32(smap_ptr + stripnr * 4 + 4); - assertRange(0, offset, smapLen-1, "screen strip"); } else { smapLen = READ_BE_UINT32(smap_ptr); if (stripnr * 4 + 8 < smapLen) offset = READ_LE_UINT32(smap_ptr + stripnr * 4 + 8); - assertRange(0, offset, smapLen-1, "screen strip"); } + assertRange(0, offset, smapLen-1, "screen strip"); return decompressBitmap(dstPtr, vs->pitch, smap_ptr + offset, height); } |