libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-31 22:53:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: update timestamp like before for inbetween SCI1.1 games

Browse Source 
svn-id: r50078
This commit is contained in:
Martin Kiewitz 2010-06-20 13:30:40 +00:00
parent 30f6e7824b
commit d2a3f59bfb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,6 +244,9 @@ bool GfxPalette::merge(Palette *pFrom, bool force, bool forceRealMerge) {
pFrom->mapping[i] = i;
}
}
// We don't update the timestamp for SCI1.1, it's only updated on kDrawPic calls
return paletteChanged;
} else {
// colors 0 (black) and 255 (white) are not affected by merging
for (i = 1 ; i < 255; i++) {
@ -293,15 +296,15 @@ bool GfxPalette::merge(Palette *pFrom, bool force, bool forceRealMerge) {
}
}
// We don't update the timestamp here for SCI1.1, it's only updated on kDrawPic calls
if (getSciVersion() < SCI_VERSION_1_1)
if (!forceRealMerge)
_sysPalette.timestamp = g_system->getMillis() * 60 / 1000;
return paletteChanged;
}
// This is used for SCI1.1 and called from kDrawPic. We only update sysPalette timestamp this way for SCI1.1
void GfxPalette::increaseSysTimestamp() {
_sysPalette.timestamp++;
if (!_alwaysForceRealMerge) // Don't do this on inbetween SCI1.1 games
_sysPalette.timestamp++;
}
uint16 GfxPalette::matchColor(byte r, byte g, byte b) {