diff options
| author | Johannes Schickel | 2008-04-16 23:11:46 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-16 23:11:46 +0000 |
| commit | b2331a01ec71bc32f31ce35aae4ea85912b6cd6d (patch) | |
| tree | ace5ca271d0629849bf401d0dcff386811c0ed88 | |
| parent | 2b87cd1fa959304ee8a9aecdbd6cfc3ee317bcc3 (diff) | |
| download | scummvm-rg350-b2331a01ec71bc32f31ce35aae4ea85912b6cd6d.tar.gz scummvm-rg350-b2331a01ec71bc32f31ce35aae4ea85912b6cd6d.tar.bz2 scummvm-rg350-b2331a01ec71bc32f31ce35aae4ea85912b6cd6d.zip | |
Fixed mask page handling in ScreenEx::copyWsaRect, this time it should be correct...
svn-id: r31524
| -rw-r--r-- | engines/kyra/screen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index a21cf171f9..04088bc209 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -3246,7 +3246,7 @@ void ScreenEx::copyWsaRect(int x, int y, int w, int h, int dimState, int plotFun while (cW--) { uint8 d = *src++; uint8 t = _shapePages[0][dst - origDst] & 7; - if (unk1 < t || curY <= _maskMinY || curY >= _maskMaxY) + if (unk1 < t && (curY > _maskMinY && curY < _maskMaxY)) d = _shapePages[1][dst - origDst]; *dst++ = d; } @@ -3258,7 +3258,7 @@ void ScreenEx::copyWsaRect(int x, int y, int w, int h, int dimState, int plotFun uint8 d = *src++; if (d) { uint8 t = _shapePages[0][dst - origDst] & 7; - if (unk1 < t || curY <= _maskMinY || curY >= _maskMaxY) + if (unk1 < t && (curY > _maskMinY && curY < _maskMaxY)) d = _shapePages[1][dst - origDst]; *dst++ = d; } else { |