diff options
| author | Max Horn | 2003-06-01 01:00:44 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-01 01:00:44 +0000 |
| commit | 3e2a7cc1cf71c8700079a54c7e1f5579fa385c0f (patch) | |
| tree | d348de50642cf55329e75f76da4d1d7ff71dac58 /scumm | |
| parent | 557be6cbfa46eaaa956878368705056ff32a96b1 (diff) | |
| download | scummvm-rg350-3e2a7cc1cf71c8700079a54c7e1f5579fa385c0f.tar.gz scummvm-rg350-3e2a7cc1cf71c8700079a54c7e1f5579fa385c0f.tar.bz2 scummvm-rg350-3e2a7cc1cf71c8700079a54c7e1f5579fa385c0f.zip | |
same change as in the old costume code: just always mask
svn-id: r8205
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/akos.cpp | 26 | ||||
| -rw-r--r-- | scumm/costume.cpp | 2 |
2 files changed, 5 insertions, 23 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp index 2ab641e3dd..c4e379942b 100644 --- a/scumm/akos.cpp +++ b/scumm/akos.cpp @@ -509,7 +509,6 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) { int skip = 0, startScaleIndexX, startScaleIndexY; int cur_x, x_right, x_left; int cur_y, y_top, y_bottom; - bool charsetmask, masking; int step; byte drawFlag = 1; @@ -690,10 +689,10 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) { if (v1.skip_width <= 0 || _height <= 0) return 0; - if ((uint) y_top > (uint) _outheight) + if ((uint) y_top > _outheight) y_top = 0; - if ((uint) y_bottom > (uint) _outheight) + if ((uint) y_bottom > _outheight) y_bottom = _outheight; if (_draw_top > y_top) @@ -703,25 +702,8 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) { v1.destptr = _outptr + v1.y * _outwidth + v1.x; - charsetmask = - _vm->hasCharsetMask(x_left, y_top + _vm->virtscr[0].topline, x_right, - _vm->virtscr[0].topline + y_bottom); - masking = false; - if (_zbuf != 0) { - masking = _vm->isMaskActiveAt(x_left, y_top, x_right, y_bottom, - _vm->getResourceAddress(rtBuffer, 9) + - _vm->gdi._imgBufOffs[_zbuf] + _vm->_screenStartStrip) != 0; - } - - v1.mask_ptr = NULL; - if (masking || charsetmask || _shadow_mode) { - v1.mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + v1.y * _numStrips + _vm->_screenStartStrip; - v1.imgbufoffs = _vm->gdi._imgBufOffs[_zbuf]; - if (!charsetmask && masking) { - v1.mask_ptr += v1.imgbufoffs; - v1.imgbufoffs = 0; - } - } + v1.mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + v1.y * _numStrips + _vm->_screenStartStrip; + v1.imgbufoffs = _vm->gdi._imgBufOffs[_zbuf]; codec1_genericDecode(); diff --git a/scumm/costume.cpp b/scumm/costume.cpp index 1e72e99c1d..c411796ccf 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -229,7 +229,7 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) { if (x_left < 0) x_left = 0; - if ((uint) y_top > (uint) _outheight) + if ((uint) y_top > _outheight) y_top = 0; if ((uint) y_bottom > _outheight) |