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

SCI: update sys palette timestamp only on kDrawPic in SCI1.1, fixes intro of island of dr. brain

Browse Source 
svn-id: r50077
This commit is contained in:
Martin Kiewitz 2010-06-20 13:25:08 +00:00
parent 871c9bddde
commit 30f6e7824b
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/sci/graphics/paint16.cpp
View File

@ -75,6 +75,10 @@ void GfxPaint16::drawPicture(GuiResourceId pictureId, int16 animationNr, bool mi
picture->draw(animationNr, mirroredFlag, addToFlag, paletteId);
delete picture;
// We update our sys palette timestamp here (SCI1.1 only)
if (getSciVersion() == SCI_VERSION_1_1)
_palette->increaseSysTimestamp();
}
// This one is the only one that updates screen!

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

@ -292,10 +292,18 @@ bool GfxPalette::merge(Palette *pFrom, bool force, bool forceRealMerge) {
}
}
}
_sysPalette.timestamp = g_system->getMillis() * 60 / 1000;
// We don't update the timestamp here for SCI1.1, it's only updated on kDrawPic calls
if (getSciVersion() < SCI_VERSION_1_1)
_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++;
}
uint16 GfxPalette::matchColor(byte r, byte g, byte b) {
byte found = 0xFF;
int diff = 0x2FFFF, cdiff;

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

@ -51,6 +51,8 @@ public:
void setOnScreen();
void increaseSysTimestamp();
bool kernelSetFromResource(GuiResourceId resourceId, bool force);
void kernelSetFlag(uint16 fromColor, uint16 toColor, uint16 flag);
void kernelUnsetFlag(uint16 fromColor, uint16 toColor, uint16 flag);