diff options
| author | Johannes Schickel | 2011-04-17 21:27:34 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-04-17 21:27:34 +0200 |
| commit | da734a4af024a72ee155bc25d6e45f994de6b060 (patch) | |
| tree | c2ca3d8215cc8b38834e1a42e9f788d4fabce32b /engines/scumm | |
| parent | 877004dbdd967d2f57d494b1aaa1cb55aae0fd52 (diff) | |
| download | scummvm-rg350-da734a4af024a72ee155bc25d6e45f994de6b060.tar.gz scummvm-rg350-da734a4af024a72ee155bc25d6e45f994de6b060.tar.bz2 scummvm-rg350-da734a4af024a72ee155bc25d6e45f994de6b060.zip | |
ALL/GRAPHICS: Remove Surface::bytesPerPixel.
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/cursor.cpp | 1 | ||||
| -rw-r--r-- | engines/scumm/gfx.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
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) { |