diff options
| author | Max Horn | 2005-03-25 01:27:28 +0000 |
|---|---|---|
| committer | Max Horn | 2005-03-25 01:27:28 +0000 |
| commit | c86b18716b2bbc1b420e4811ba714e83b0c997bc (patch) | |
| tree | 73f458379647d7f63879bb1b2460a31020364e22 /scumm/charset.cpp | |
| parent | 7ed1c19f6c46d46cd0fae4a505887675e8338e49 (diff) | |
| download | scummvm-rg350-c86b18716b2bbc1b420e4811ba714e83b0c997bc.tar.gz scummvm-rg350-c86b18716b2bbc1b420e4811ba714e83b0c997bc.tar.bz2 scummvm-rg350-c86b18716b2bbc1b420e4811ba714e83b0c997bc.zip | |
Started some cleanup work on class Gdi (in particular, I try to limit that class to GFX decoding only, and moved the screen rendering code out of it)
svn-id: r17225
Diffstat (limited to 'scumm/charset.cpp')
| -rw-r--r-- | scumm/charset.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/scumm/charset.cpp b/scumm/charset.cpp index c62140630e..458de41a13 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -202,6 +202,7 @@ CharsetRenderer::CharsetRenderer(ScummEngine *vm) { _blitAlso = false; _firstChar = false; _disableOffsX = false; + _textSurface.pixels = 0; _vm = vm; _curId = 0; @@ -1218,8 +1219,8 @@ void CharsetRendererV3::printChar(int chr) { dst = vs->getPixels(_left, drawTop); drawBits1(*vs, dst, charPtr, drawTop, origWidth, origHeight); } else { - dst = (byte *)_vm->gdi._textSurface.pixels + _top * _vm->gdi._textSurface.pitch + _left; - drawBits1(_vm->gdi._textSurface, dst, charPtr, drawTop, origWidth, origHeight); + dst = (byte *)_textSurface.pixels + _top * _textSurface.pitch + _left; + drawBits1(_textSurface, dst, charPtr, drawTop, origWidth, origHeight); } if (_str.left > _left) @@ -1375,8 +1376,8 @@ void CharsetRendererClassic::printChar(int chr) { dstSurface = *vs; dstPtr = vs->getPixels(_left, drawTop); } else { - dstSurface = _vm->gdi._textSurface; - dstPtr = (byte *)_vm->gdi._textSurface.pixels + (_top - _vm->_screenTop) * _vm->gdi._textSurface.pitch + _left; + dstSurface = _textSurface; + dstPtr = (byte *)_textSurface.pixels + (_top - _vm->_screenTop) * _textSurface.pitch + _left; } if (_blitAlso && vs->hasTwoBuffers) { @@ -1650,7 +1651,7 @@ void CharsetRendererNut::printChar(int chr) { s = *vs; s.pixels = vs->getPixels(0, 0); } else { - s = _vm->gdi._textSurface; + s = _textSurface; drawTop -= _vm->_screenTop; } @@ -1790,8 +1791,8 @@ void CharsetRendererNES::printChar(int chr) { dst = vs->getPixels(_left, drawTop); drawBits1(*vs, dst, charPtr, drawTop, origWidth, origHeight); } else { - dst = (byte *)_vm->gdi._textSurface.pixels + _top * _vm->gdi._textSurface.pitch + _left; - drawBits1(_vm->gdi._textSurface, dst, charPtr, drawTop, origWidth, origHeight); + dst = (byte *)_textSurface.pixels + _top * _textSurface.pitch + _left; + drawBits1(_textSurface, dst, charPtr, drawTop, origWidth, origHeight); } if (_str.left > _left) |