diff options
| author | Johannes Schickel | 2013-08-03 02:36:43 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2013-08-03 04:02:50 +0200 |
| commit | 0a1cbac76ac66876d187d2951c671a86a4812a59 (patch) | |
| tree | f8c93736e8bf45dcf2ea7b4d14c43859d9bbf2b3 /engines | |
| parent | b1bd9322a1867d95d0faa7a3ce2865b8ead8d3f8 (diff) | |
| download | scummvm-rg350-0a1cbac76ac66876d187d2951c671a86a4812a59.tar.gz scummvm-rg350-0a1cbac76ac66876d187d2951c671a86a4812a59.tar.bz2 scummvm-rg350-0a1cbac76ac66876d187d2951c671a86a4812a59.zip | |
SCUMM: Take advantage of Surface::getPixels.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/charset.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/gfx.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/gfx_towns.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/animation_he.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index 6e289b2afc..298fb149f4 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -799,7 +799,7 @@ void CharsetRendererClassic::printCharIntern(bool is2byte, const byte *charPtr, if (ignoreCharsetMask || !vs->hasTwoBuffers) { dstPtr = vs->getPixels(0, 0); } else { - dstPtr = (byte *)_vm->_textSurface.getBasePtr(0, 0); + dstPtr = (byte *)_vm->_textSurface.getPixels(); } if (_blitAlso && vs->hasTwoBuffers) { diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index 41899da0a3..3da07610eb 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -612,7 +612,7 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i // Some paranoia checks assert(top >= 0 && bottom <= vs->h); assert(x >= 0 && width <= vs->pitch); - assert(_textSurface.getBasePtr(0, 0)); + assert(_textSurface.getPixels()); // Perform some clipping if (width > vs->w - x) @@ -1135,7 +1135,7 @@ void ScummEngine::clearTextSurface() { _townsScreen->fillLayerRect(1, 0, 0, _textSurface.w, _textSurface.h, 0); #endif - fill((byte *)_textSurface.getBasePtr(0, 0), _textSurface.pitch, + fill((byte *)_textSurface.getPixels(), _textSurface.pitch, #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE _game.platform == Common::kPlatformFMTowns ? 0 : #endif diff --git a/engines/scumm/gfx_towns.cpp b/engines/scumm/gfx_towns.cpp index a803b6e511..0aed181afd 100644 --- a/engines/scumm/gfx_towns.cpp +++ b/engines/scumm/gfx_towns.cpp @@ -34,7 +34,7 @@ void ScummEngine::towns_drawStripToScreen(VirtScreen *vs, int dstX, int dstY, in if (width <= 0 || height <= 0) return; - assert(_textSurface.getBasePtr(0, 0)); + assert(_textSurface.getPixels()); int m = _textSurfaceMultiplier; diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 7ae5547702..d01b456c8b 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -90,7 +90,7 @@ void MoviePlayer::copyFrameToBuffer(byte *dst, int dstType, uint x, uint y, uint if (!surface) return; - const byte *src = (const byte *)surface->getBasePtr(0, 0); + const byte *src = (const byte *)surface->getPixels(); if (_video->hasDirtyPalette()) _vm->setPaletteFromPtr(_video->getPalette(), 256); |