aboutsummaryrefslogtreecommitdiff
path: root/engines/made/screen.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2013-08-02 23:47:42 +0200
committerJohannes Schickel2013-08-03 02:52:32 +0200
commit8f73027d8273b482386d8c114674876b11069957 (patch)
treeb0467f5c4894eec0503fb3529aa8fb4411b4e5f5 /engines/made/screen.cpp
parent786ad6cea0caa076b1af56eb2bb6d85075e6bfd0 (diff)
downloadscummvm-rg350-8f73027d8273b482386d8c114674876b11069957.tar.gz
scummvm-rg350-8f73027d8273b482386d8c114674876b11069957.tar.bz2
scummvm-rg350-8f73027d8273b482386d8c114674876b11069957.zip
MADE: Prefer getBasePtr over direct Surface::pixels access.
Diffstat (limited to 'engines/made/screen.cpp')
-rw-r--r--engines/made/screen.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/made/screen.cpp b/engines/made/screen.cpp
index ea7d57f82d..737b009565 100644
--- a/engines/made/screen.cpp
+++ b/engines/made/screen.cpp
@@ -344,12 +344,12 @@ void Screen::drawSpriteChannels(const ClipInfo &clipInfo, int16 includeStateMask
void Screen::updateSprites() {
// TODO: This needs some more work, dirty rectangles are currently not used
- memcpy(_workScreen->pixels, _backgroundScreen->pixels, 64000);
+ memcpy(_workScreen->getBasePtr(0, 0), _backgroundScreen->getBasePtr(0, 0), 64000);
drawSpriteChannels(_backgroundScreenDrawCtx, 3, 0);
drawSpriteChannels(_workScreenDrawCtx, 1, 2);
- _vm->_system->copyRectToScreen(_workScreen->pixels, _workScreen->pitch, 0, 0, _workScreen->w, _workScreen->h);
+ _vm->_system->copyRectToScreen(_workScreen->getBasePtr(0, 0), _workScreen->pitch, 0, 0, _workScreen->w, _workScreen->h);
_vm->_screen->updateScreenAndWait(10);
}
@@ -593,7 +593,7 @@ void Screen::show() {
return;
drawSpriteChannels(_backgroundScreenDrawCtx, 3, 0);
- memcpy(_workScreen->pixels, _backgroundScreen->pixels, 64000);
+ memcpy(_workScreen->getBasePtr(0, 0), _backgroundScreen->getBasePtr(0, 0), 64000);
drawSpriteChannels(_workScreenDrawCtx, 1, 2);
_fx->run(_visualEffectNum, _workScreen, _palette, _newPalette, _paletteColorCount);
@@ -775,7 +775,7 @@ void Screen::unlockScreen() {
}
void Screen::showWorkScreen() {
- _vm->_system->copyRectToScreen(_workScreen->pixels, _workScreen->pitch, 0, 0, _workScreen->w, _workScreen->h);
+ _vm->_system->copyRectToScreen(_workScreen->getBasePtr(0, 0), _workScreen->pitch, 0, 0, _workScreen->w, _workScreen->h);
}
void Screen::copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) {