libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-12 12:40:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: change actual setting of palette, fixes gk1 palette issue when talking to grace indirectly caused by r47955, seems to also fix jones palette issue, could cause regressions

Browse Source 
svn-id: r48474
This commit is contained in:
Martin Kiewitz 2010-04-02 18:48:17 +00:00
parent 7e1f395e34
commit bc311445f8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/sci/graphics/palette.cpp
View File

@ -192,10 +192,14 @@ void GfxPalette::set(Palette *sciPal, bool force, bool forceRealMerge) {
bool paletteChanged;
if (force || sciPal->timestamp != systime) {
paletteChanged = merge(sciPal, &_sysPalette, force, forceRealMerge);
_sysPaletteChanged |= merge(sciPal, &_sysPalette, force, forceRealMerge);
sciPal->timestamp = _sysPalette.timestamp;
if (paletteChanged && _screen->_picNotValid == 0 && systime != _sysPalette.timestamp)
if (_sysPaletteChanged && _screen->_picNotValid == 0) { // && systime != _sysPalette.timestamp) {
// Removed timestamp checking, because this shouldnt be needed anymore. I'm leaving it commented just in
// case this causes regressions
setOnScreen();
_sysPaletteChanged = false;
}
}
}

2
engines/sci/graphics/palette.h
View File

@ -75,6 +75,8 @@ private:
uint32 _palVaryStart;
uint32 _palVaryEnd;
bool _sysPaletteChanged;
Common::Array<PalSchedule> _schedules;
};