[Scummvm-cvs-logs] scummvm master -> 5ca8b5ff4c55b7cac931b0973f604148711e3580
bluegr
bluegr at gmail.com
Fri Mar 11 04:22:08 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5ca8b5ff4c SCI32: Fix bug in updateRemap()
Commit: 5ca8b5ff4c55b7cac931b0973f604148711e3580
https://github.com/scummvm/scummvm/commit/5ca8b5ff4c55b7cac931b0973f604148711e3580
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-03-11T05:21:43+02:00
Commit Message:
SCI32: Fix bug in updateRemap()
Changed paths:
engines/sci/graphics/remap.cpp
diff --git a/engines/sci/graphics/remap.cpp b/engines/sci/graphics/remap.cpp
index b92977f..762ff47 100644
--- a/engines/sci/graphics/remap.cpp
+++ b/engines/sci/graphics/remap.cpp
@@ -170,7 +170,8 @@ void GfxRemap32::initColorArrays(byte index) {
bool GfxRemap32::updateRemap(byte index) {
int result;
RemapParams *curRemap = &_remaps[index];
- Palette *curPalette = &g_sci->_gfxPalette32->_sysPalette;
+ const Palette *curPalette = &g_sci->_gfxPalette32->_sysPalette;
+ const Palette *nextPalette = g_sci->_gfxPalette32->getNextPalette();
bool changed = false;
memset(_targetChanged, false, 236);
@@ -195,7 +196,8 @@ bool GfxRemap32::updateRemap(byte index) {
return changed;
case kRemappingByPercent:
for (int i = 1; i < 236; i++) {
- Color color = curPalette->colors[i];
+ // NOTE: This method uses nextPalette instead of curPalette
+ Color color = nextPalette->colors[i];
if (curRemap->curColor[i] != color) {
curRemap->colorChanged[i] = true;
More information about the Scummvm-git-logs
mailing list