thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: fix race condition in sierra kPalVary code

Browse source 
we are loading pictures very fast, this results in a kPalVary race condition, because sierra set timer to 1 tick, when it was getting called with 0 ticks and required the timer to occur before the transition. Fixes freddy pharkas nighttime being daytime during transitions (bug #3051905)

svn-id: r52351
This commit is contained in:
Martin Kiewitz 2010-08-24 17:22:05 +00:00
parent d48e173da1
commit 3e6fb233ac
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
engines/sci/graphics/palette.cpp
View file

@ -614,9 +614,18 @@ bool GfxPalette::kernelPalVaryInit(GuiResourceId resourceId, uint16 ticks, uint1
_palVaryStepStop = stepStop; _palVaryStepStop = stepStop;
_palVaryDirection = direction; _palVaryDirection = direction;
// if no ticks are given, jump directly to destination // if no ticks are given, jump directly to destination
if (!_palVaryTicks) if (!_palVaryTicks) {
_palVaryDirection = stepStop; _palVaryDirection = stepStop;
palVaryInstallTimer(); // sierra sci set the timer to 1 tick instead of calling it directly
// we have to change this to prevent a race condition to happen in
// at least freddy pharkas during nighttime. In that case kPalVary is
// called right before that and because we load pictures much faster
// the 1 tick won't pass sometimes resulting in the palette being
// daytime instead of nighttime during the transition.
palVaryProcess(1, true);
} else {
palVaryInstallTimer();
}
return true; return true;
} }
return false; return false;
@ -633,9 +642,14 @@ int16 GfxPalette::kernelPalVaryReverse(int16 ticks, uint16 stepStop, int16 direc
_palVaryStepStop = stepStop; _palVaryStepStop = stepStop;
_palVaryDirection = direction != -1 ? -direction : -_palVaryDirection; _palVaryDirection = direction != -1 ? -direction : -_palVaryDirection;
if (!_palVaryTicks) if (!_palVaryTicks) {
_palVaryDirection = _palVaryStepStop - _palVaryStep; _palVaryDirection = _palVaryStepStop - _palVaryStep;
palVaryInstallTimer(); // ffs. see palVaryInit right above, we fix the code here as well
// just in case
palVaryProcess(1, true);
} else {
palVaryInstallTimer();
}
return kernelPalVaryGetCurrentStep(); return kernelPalVaryGetCurrentStep();
} }