diff options
| author | Jordi Vilalta Prat | 2011-02-16 12:25:11 +0100 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2011-02-16 12:25:11 +0100 |
| commit | dd43dfc81c81f489d161ae66fd286ea50bb3e3ce (patch) | |
| tree | 57b331b859e07c5140fee9a78cc73b04b3b0dab3 /engines/groovie | |
| parent | c44538a01e33e71e9f85554d343d67a7c8dfe3ed (diff) | |
| download | scummvm-rg350-dd43dfc81c81f489d161ae66fd286ea50bb3e3ce.tar.gz scummvm-rg350-dd43dfc81c81f489d161ae66fd286ea50bb3e3ce.tar.bz2 scummvm-rg350-dd43dfc81c81f489d161ae66fd286ea50bb3e3ce.zip | |
GROOVIE: Simplify the cursor palette reading.
Diffstat (limited to 'engines/groovie')
| -rw-r--r-- | engines/groovie/cursor.cpp | 6 | ||||
| -rw-r--r-- | engines/groovie/graphics.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/engines/groovie/cursor.cpp b/engines/groovie/cursor.cpp index 3f76ed977f..6a87af8daf 100644 --- a/engines/groovie/cursor.cpp +++ b/engines/groovie/cursor.cpp @@ -227,11 +227,7 @@ byte *GrvCursorMan_t7g::loadImage(Common::SeekableReadStream &file) { byte *GrvCursorMan_t7g::loadPalette(Common::SeekableReadStream &file) { byte *palette = new byte[3 * 32]; - for (uint8 colournum = 0; colournum < 32; colournum++) { - palette[colournum * 3 + 0] = file.readByte(); - palette[colournum * 3 + 1] = file.readByte(); - palette[colournum * 3 + 2] = file.readByte(); - } + file.read(palette, 3 * 32); return palette; } diff --git a/engines/groovie/graphics.cpp b/engines/groovie/graphics.cpp index 62ab25d9d3..3ceeeb6018 100644 --- a/engines/groovie/graphics.cpp +++ b/engines/groovie/graphics.cpp @@ -106,7 +106,7 @@ void GraphicsMan::fadeIn(byte *pal) { _fadeStartTime = _vm->_system->getMillis(); // Copy the target palette - memcpy(_paletteFull, pal, 3*256); + memcpy(_paletteFull, pal, 3 * 256); // Set the current fading _fading = 1; |