diff options
author | Johannes Schickel | 2013-08-03 03:48:41 +0200 |
---|---|---|
committer | Johannes Schickel | 2013-08-03 04:14:07 +0200 |
commit | c22d91405429ad9866c6340939943aa21cd49d03 (patch) | |
tree | ca2df564eb43c33ebc4c63f080363fb0841d76e0 /engines/scumm/cursor.cpp | |
parent | 260ec7a430b34f75ec6c30f0f8f444bb7397341e (diff) | |
download | scummvm-rg350-c22d91405429ad9866c6340939943aa21cd49d03.tar.gz scummvm-rg350-c22d91405429ad9866c6340939943aa21cd49d03.tar.bz2 scummvm-rg350-c22d91405429ad9866c6340939943aa21cd49d03.zip |
SCUMM: Do not set Surface::pixels directly anymore.
Diffstat (limited to 'engines/scumm/cursor.cpp')
-rw-r--r-- | engines/scumm/cursor.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index 3eb7246b3a..721644b554 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -417,13 +417,11 @@ void ScummEngine_v5::redefineBuiltinCursorFromChar(int index, int chr) { Graphics::Surface s; byte buf[16*17]; memset(buf, 123, 16*17); - s.pixels = buf; - s.w = _charset->getCharWidth(chr); - s.h = _charset->getFontHeight(); - s.pitch = s.w; + s.init(_charset->getCharWidth(chr), _charset->getFontHeight(), + _charset->getCharWidth(chr), buf, + Graphics::PixelFormat::createFormatCLUT8()); // s.h = 17 for FM-TOWNS Loom Japanese. Fixes bug #1166917 assert(s.w <= 16 && s.h <= 17); - s.format = Graphics::PixelFormat::createFormatCLUT8(); _charset->drawChar(chr, s, 0, 0); |