TINSEL: Take advantage of Surface::getPixels.

scummvm · Aug 3, 2013 · 2977ff8 · 2977ff8
1 parent 4ddace8
commit 2977ff8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
@@ -1031,7 +1031,7 @@ void BMVPlayer::CopyMovieToScreen() {
 	// The movie surface is slightly less high than the output screen (429 rows versus 432).
 	// Because of this, there's some extra line clearing above and below the displayed area
 	int yStart = (SCREEN_HEIGHT - SCREEN_HIGH) / 2;
-	memset(_vm->screen().getBasePtr(0, 0), 0, yStart * SCREEN_WIDTH);
+	memset(_vm->screen().getPixels(), 0, yStart * SCREEN_WIDTH);
 	memcpy(_vm->screen().getBasePtr(0, yStart), ScreenBeg, SCREEN_WIDTH * SCREEN_HIGH);
 	memset(_vm->screen().getBasePtr(0, yStart + SCREEN_HIGH), 0,
 		(SCREEN_HEIGHT - SCREEN_HIGH - yStart) * SCREEN_WIDTH);

diff --git a/engines/tinsel/graphics.cpp b/engines/tinsel/graphics.cpp
@@ -798,7 +798,7 @@ static void PackedWrtNonZero(DRAWOBJECT *pObj, uint8 *srcP, uint8 *destP,
  */
 void ClearScreen() {
 	byte blackColorIndex = (!TinselV1Mac) ? 0 : 255;
-	void *pDest = _vm->screen().getBasePtr(0, 0);
+	void *pDest = _vm->screen().getPixels();
 	memset(pDest, blackColorIndex, SCREEN_WIDTH * SCREEN_HEIGHT);
 	g_system->fillScreen(blackColorIndex);
 	g_system->updateScreen();