diff options
| author | Johannes Schickel | 2011-02-19 21:42:34 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-02-19 21:46:45 +0100 |
| commit | e21d6e0d1120e917a4a019a4070ec4db5e988b9b (patch) | |
| tree | 1142828b72ccf17d513c621e108d749f148fd32b /engines/queen | |
| parent | 32d0e4c15fb33f80db194087850466664a43516a (diff) | |
| parent | b26f30b98793c522265a3eeb48fb3b41034663c6 (diff) | |
| download | scummvm-rg350-e21d6e0d1120e917a4a019a4070ec4db5e988b9b.tar.gz scummvm-rg350-e21d6e0d1120e917a4a019a4070ec4db5e988b9b.tar.bz2 scummvm-rg350-e21d6e0d1120e917a4a019a4070ec4db5e988b9b.zip | |
Merge branch 'osystem-palette' of https://github.com/lordhoto/scummvm into master
Conflicts:
backends/platform/android/android.cpp
engines/sci/graphics/screen.cpp
engines/sci/graphics/transitions.cpp
Diffstat (limited to 'engines/queen')
| -rw-r--r-- | engines/queen/display.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp index 4557588732..7b16df52bf 100644 --- a/engines/queen/display.cpp +++ b/engines/queen/display.cpp @@ -159,15 +159,7 @@ void Display::palSet(const uint8 *pal, int start, int end, bool updateScreen) { debug(9, "Display::palSet(%d, %d)", start, end); const int numColors = end - start + 1; assert(numColors <= 256); - uint8 tempPal[256 * 4]; - pal += start * 3; - for (int i = 0; i < numColors; i++) { - tempPal[4 * i + 0] = *pal++; - tempPal[4 * i + 1] = *pal++; - tempPal[4 * i + 2] = *pal++; - tempPal[4 * i + 3] = 0; - } - _system->getPaletteManager()->setPalette(tempPal, start, numColors); + _system->getPaletteManager()->setPalette(pal + start * 3, start, numColors); if (updateScreen) { _vm->input()->delay(20); } |