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/tucker/locations.cpp | |
| 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/tucker/locations.cpp')
| -rw-r--r-- | engines/tucker/locations.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp index cd99656695..108c6bcad5 100644 --- a/engines/tucker/locations.cpp +++ b/engines/tucker/locations.cpp @@ -1791,11 +1791,11 @@ void TuckerEngine::execData3PreUpdate_locationNum29() { _updateLocationFadePaletteCounter = 0; } const int d = _updateLocationFadePaletteCounter / 2; - uint8 scrollPal[5 * 4]; + uint8 scrollPal[5 * 3]; for (int i = 0; i < 5; ++i) { - scrollPal[i * 4] = r[i + d]; - scrollPal[i * 4 + 1] = g[i + d]; - scrollPal[i * 4 + 2] = b[i + d]; + scrollPal[i * 3] = r[i + d]; + scrollPal[i * 3 + 1] = g[i + d]; + scrollPal[i * 3 + 2] = b[i + d]; } _system->getPaletteManager()->setPalette(scrollPal, 118, 5); if (_flagsTable[143] == 1) { |