From da734a4af024a72ee155bc25d6e45f994de6b060 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 17 Apr 2011 21:27:34 +0200
Subject: ALL/GRAPHICS: Remove Surface::bytesPerPixel.

---
 engines/scumm/cursor.cpp | 1 -
 engines/scumm/gfx.cpp    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 7380cfe2ea..820605924c 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -385,7 +385,6 @@ void ScummEngine_v5::redefineBuiltinCursorFromChar(int index, int chr) {
 		s.pitch = s.w;
 		// s.h = 17 for FM-TOWNS Loom Japanese. Fixes bug #1166917
 		assert(s.w <= 16 && s.h <= 17);
-		s.bytesPerPixel = 1;
 		s.format = Graphics::PixelFormat::createFormatCLUT8();
 
 		_charset->drawChar(chr, s, 0, 0);
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 876d6bf8ff..0472e16928 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -387,7 +387,7 @@ void ScummEngine::initVirtScreen(VirtScreenNumber slot, int top, int width, int
 	vs->backBuf = NULL;
 	// TODO: This should really rather setup the correct format instead of
 	// only setting the bytes per pixel.
-	vs->bytesPerPixel = vs->format.bytesPerPixel = (_game.features & GF_16BIT_COLOR) ? 2 : 1;
+	vs->format.bytesPerPixel = (_game.features & GF_16BIT_COLOR) ? 2 : 1;
 	vs->pitch = width * vs->format.bytesPerPixel;
 
 	if (_game.version >= 7) {
-- 
cgit v1.2.3