ALL/GRAPHICS: Remove Surface::bytesPerPixel.

6 files changed, 1 insertions, 8 deletions

diff --git a/engines/hugo/intro.cpp b/engines/hugo/intro.cpp
index e79c0a72c0..c1c84d1e32 100644
--- a/engines/hugo/intro.cpp
+++ b/engines/hugo/intro.cpp
@@ -93,7 +93,6 @@ void intro_v1d::introInit() {
 	surf.h = 200;
 	surf.pixels = _vm->_screen->getFrontBuffer();
 	surf.pitch = 320;
-	surf.bytesPerPixel = 1;
 	surf.format = Graphics::PixelFormat::createFormatCLUT8();
 	_vm->_screen->displayList(kDisplayInit);
 }
@@ -248,7 +247,6 @@ void intro_v2d::introInit() {
 	surf.h = 200;
 	surf.pixels = _vm->_screen->getFrontBuffer();
 	surf.pitch = 320;
-	surf.bytesPerPixel = 1;
 	surf.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	char buffer[128];
@@ -295,7 +293,6 @@ void intro_v3d::introInit() {
 	surf.h = 200;
 	surf.pixels = _vm->_screen->getFrontBuffer();
 	surf.pitch = 320;
-	surf.bytesPerPixel = 1;
 	surf.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	char buffer[128];
diff --git a/engines/m4/graphics.h b/engines/m4/graphics.h
index d74f7adfe8..96e81f746e 100644
--- a/engines/m4/graphics.h
+++ b/engines/m4/graphics.h
@@ -117,7 +117,6 @@ public:
 		_ownsData = true;
 	}
 	M4Surface(int width_, int height_, byte *srcPixels, int pitch_) {
-		bytesPerPixel = 1;
 		format = Graphics::PixelFormat::createFormatCLUT8();
 		w = width_;
 		h = height_;
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) {
diff --git a/engines/sword25/gfx/image/renderedimage.cpp b/engines/sword25/gfx/image/renderedimage.cpp
index 494b631f14..806d9b27ad 100644
--- a/engines/sword25/gfx/image/renderedimage.cpp
+++ b/engines/sword25/gfx/image/renderedimage.cpp
@@ -187,7 +187,6 @@ bool RenderedImage::blit(int posX, int posY, int flipping, Common::Rect *pPartRe
 
 	// Create an encapsulating surface for the data
 	Graphics::Surface srcImage;
-	srcImage.bytesPerPixel = 4;
 	// TODO: Is the data really in the screen format?
 	srcImage.format = g_system->getScreenFormat();
 	srcImage.pitch = _width * 4;
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index c4520704a4..51db2febf9 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -282,7 +282,6 @@ Graphics::Surface GfxSurface::lockSurface() {
 	result.w = _bounds.width();
 	result.h = _bounds.height();
 	result.pitch = src->pitch;
-	result.bytesPerPixel = src->bytesPerPixel;
 	result.format = src->format;
 	result.pixels = src->getBasePtr(_bounds.left, _bounds.top);