diff options
| author | Max Horn | 2004-08-08 22:10:38 +0000 |
|---|---|---|
| committer | Max Horn | 2004-08-08 22:10:38 +0000 |
| commit | 835ef5f0127718959425dfdd7c123cf14ce13829 (patch) | |
| tree | 38beec4b02a7fdf0d08fd22fdd7f2e2b9ab07cee /scumm/costume.cpp | |
| parent | f8cc6c22416c0e9615abfdd98fc2e86852e897a9 (diff) | |
| download | scummvm-rg350-835ef5f0127718959425dfdd7c123cf14ce13829.tar.gz scummvm-rg350-835ef5f0127718959425dfdd7c123cf14ce13829.tar.bz2 scummvm-rg350-835ef5f0127718959425dfdd7c123cf14ce13829.zip | |
Patch #1003866 (SCUMM: New text rendering code (fixes various bugs))
svn-id: r14521
Diffstat (limited to 'scumm/costume.cpp')
| -rw-r--r-- | scumm/costume.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp index d51909a7fb..617ac078ad 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -284,8 +284,7 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) { v1.destptr = _outptr + v1.y * _outwidth + v1.x; - v1.mask_ptr = _vm->getMaskBuffer(0, v1.y, 0); - v1.imgbufoffs = _vm->gdi._imgBufOffs[_zbuf]; + v1.mask_ptr = _vm->getMaskBuffer(0, v1.y, _zbuf); CHECK_HEAP @@ -350,7 +349,7 @@ static const int v1MMActorPalatte2[25] = { }; #define MASK_AT(xoff) \ - (mask && (mask[((v1.x + xoff) / 8) + v1.imgbufoffs] & revBitMask[(v1.x + xoff) & 7])) + (mask && (mask[((v1.x + xoff) / 8)] & revBitMask[(v1.x + xoff) & 7])) #define LINE(c,p) \ pcolor = (color >> c) & 3; \ if (pcolor) { \ @@ -467,7 +466,7 @@ void CostumeRenderer::proc3() { do { if (_scaleY == 255 || *scaleytab++ < _scaleY) { - masked = (y < 0 || y >= _outheight) || (v1.mask_ptr && ((mask[0] | mask[v1.imgbufoffs]) & maskbit)); + masked = (y < 0 || y >= _outheight) || (v1.mask_ptr && (mask[0] & maskbit)); if (color && !masked) { // FIXME: Fully implement _shadow_mode.in Sam & Max @@ -536,7 +535,7 @@ void CostumeRenderer::proc3_ami() { len = *src++; do { if (_scaleY == 255 || cost_scaleTable[_scaleIndexY] < _scaleY) { - masked = (y < 0 || y >= _outheight) || (v1.mask_ptr && ((mask[0] | mask[v1.imgbufoffs]) & maskbit)); + masked = (y < 0 || y >= _outheight) || (v1.mask_ptr && (mask[0] & maskbit)); if (color && v1.x >= 0 && v1.x < _outwidth && !masked) { *dst = _palette[color]; |