aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/scene.cpp
diff options
context:
space:
mode:
authorMax Horn2009-12-07 18:22:18 +0000
committerMax Horn2009-12-07 18:22:18 +0000
commitf8126d9da676e69dff384b8a8f7136ad27fb014d (patch)
treedf1b86f98b4792fa4c44f71237f0722aca762584 /engines/m4/scene.cpp
parent6d1e4dd0344f9baef12709e2c90ac98e17392786 (diff)
downloadscummvm-rg350-f8126d9da676e69dff384b8a8f7136ad27fb014d.tar.gz
scummvm-rg350-f8126d9da676e69dff384b8a8f7136ad27fb014d.tar.bz2
scummvm-rg350-f8126d9da676e69dff384b8a8f7136ad27fb014d.zip
M4: Make M4Surface member w, h, pixels protected; some cleanup
svn-id: r46280
Diffstat (limited to 'engines/m4/scene.cpp')
-rw-r--r--engines/m4/scene.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/scene.cpp b/engines/m4/scene.cpp
index b1942fa27a..3d99e62961 100644
--- a/engines/m4/scene.cpp
+++ b/engines/m4/scene.cpp
@@ -435,8 +435,8 @@ void Scene::showHotSpots() {
// Test function, shows all scene codes
void Scene::showCodes() {
- uint8 *pixelData = (uint8*)_codeSurface->pixels;
- for (int i = 0; i < _codeSurface->w * _codeSurface->h; i++)
+ uint8 *pixelData = _codeSurface->getBasePtr(0, 0);
+ for (int i = 0; i < _codeSurface->width() * _codeSurface->height(); i++)
if (pixelData[i] & 0x10)
pixelData[i] = 0xFF;
else
@@ -450,7 +450,7 @@ void Scene::showCodes() {
_vm->_palette->setPalette(colors, 0, 256);
_backgroundSurface->copyFrom(_codeSurface, Common::Rect(0, 0, 640, 480), 0, 0);
- //_system->copyRectToScreen((byte *)codes->pixels, codes->w, 0, 0, codes->w, codes->h);
+ //_system->copyRectToScreen(codes->getBasePtr(0, 0), codes->w, 0, 0, codes->w, codes->h);
}
void Scene::playIntro() {