aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorEugene Sandulenko2006-01-06 15:02:07 +0000
committerEugene Sandulenko2006-01-06 15:02:07 +0000
commit7a9c617e2added54808a15cf1cd44cc49c944f16 (patch)
treebf91e9bac1a8c7c5314e68d757ac38aa31887798 /scumm
parentf3c64fe7b3152996ecbcc097ae6711102b47fc57 (diff)
downloadscummvm-rg350-7a9c617e2added54808a15cf1cd44cc49c944f16.tar.gz
scummvm-rg350-7a9c617e2added54808a15cf1cd44cc49c944f16.tar.bz2
scummvm-rg350-7a9c617e2added54808a15cf1cd44cc49c944f16.zip
Finally fix MM NES crash.
svn-id: r19933
Diffstat (limited to 'scumm')
-rw-r--r--scumm/gfx.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 81354fcf35..b193b51df7 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -577,6 +577,8 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
x += 16;
while (x + width >= _screenWidth)
width -= 16;
+ if (width < 0)
+ return;
}
_system->copyRectToScreen(_compositeBuf + x1 + y * _screenWidth, _screenWidth, x, y, width, height);
@@ -3025,6 +3027,7 @@ void ScummEngine::transitionEffect(int a) {
t = tab_2[i * 4 + 1];
r = tab_2[i * 4 + 2];
b = tab_2[i * 4 + 3];
+
if (t == b) {
while (l <= r) {
if (l >= 0 && l < gdi._numStrips && t < bottom) {