diff options
| author | Max Horn | 2007-01-18 21:48:23 +0000 |
|---|---|---|
| committer | Max Horn | 2007-01-18 21:48:23 +0000 |
| commit | 2ac841f18bbffa8ce8f05ce19c78e1d27c7a2296 (patch) | |
| tree | 74f52deadd3653d3e7c582e9fec0027c2446b9e0 /engines/scumm/gfx.cpp | |
| parent | fb95758b818cc41a9f125f809c7441da918dd552 (diff) | |
| download | scummvm-rg350-2ac841f18bbffa8ce8f05ce19c78e1d27c7a2296.tar.gz scummvm-rg350-2ac841f18bbffa8ce8f05ce19c78e1d27c7a2296.tar.bz2 scummvm-rg350-2ac841f18bbffa8ce8f05ce19c78e1d27c7a2296.zip | |
Make use of Surface::getBasePtr
svn-id: r25119
Diffstat (limited to 'engines/scumm/gfx.cpp')
| -rw-r--r-- | engines/scumm/gfx.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index 657f85345d..e7696a11d8 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -570,7 +570,7 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i if (_game.version < 7) { // Handle the text mask in older games; newer (V7/V8) games do not use it anymore. - const byte *text = (byte *)_charset->_textSurface.pixels + x + y * _charset->_textSurface.pitch; + const byte *text = (byte *)_charset->_textSurface.getBasePtr(x, y); #ifdef __DS__ DS::asmDrawStripToScreen(height, width, text, src, dst, vs->pitch, _screenWidth, _charset->_textSurface.pitch); @@ -904,7 +904,7 @@ void ScummEngine::restoreBackground(Common::Rect rect, byte backColor) { if (vs->hasTwoBuffers && _currentRoom != 0 && isLightOn()) { blit(screenBuf, vs->pitch, vs->getBackPixels(rect.left, rect.top), vs->pitch, width, height); if (vs->number == kMainVirtScreen && _charset->_hasMask) { - byte *mask = (byte *)_charset->_textSurface.pixels + _charset->_textSurface.pitch * (rect.top - _screenTop) + rect.left; + byte *mask = (byte *)_charset->_textSurface.getBasePtr(rect.left, rect.top - _screenTop); fill(mask, _charset->_textSurface.pitch, CHARSET_MASK_TRANSPARENCY, width, height); } } else { @@ -1098,7 +1098,7 @@ void ScummEngine::drawBox(int x, int y, int x2, int y2, int color) { error("can only copy bg to main window"); blit(backbuff, vs->pitch, bgbuff, vs->pitch, width, height); if (_charset->_hasMask) { - byte *mask = (byte *)_charset->_textSurface.pixels + _charset->_textSurface.pitch * (y - _screenTop) + x; + byte *mask = (byte *)_charset->_textSurface.getBasePtr(x, y - _screenTop); fill(mask, _charset->_textSurface.pitch, CHARSET_MASK_TRANSPARENCY, width, height); } } else if (_game.heversion == 100) { |