aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2010-06-20 16:48:52 +0000
committerMartin Kiewitz2010-06-20 16:48:52 +0000
commite8262d989e31742f554d37c962254c6ac37a1a7f (patch)
tree6c30818ac95bf63930c3d741b16c0dc2be68596b
parent8fcb14d235cc4dbfc25eb503d197ff5c2f268179 (diff)
downloadscummvm-rg350-e8262d989e31742f554d37c962254c6ac37a1a7f.tar.gz
scummvm-rg350-e8262d989e31742f554d37c962254c6ac37a1a7f.tar.bz2
scummvm-rg350-e8262d989e31742f554d37c962254c6ac37a1a7f.zip
SCI: adding code for kPalVary ticks == 0 case, fixes pharkas
svn-id: r50084
-rw-r--r--engines/sci/graphics/palette.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 68483ac954..812bbfb234 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -506,6 +506,11 @@ void GfxPalette::kernelPalVaryInit(GuiResourceId resourceId, uint16 ticks, uint1
_palVaryStep = 1;
_palVaryStepStop = stepStop;
_palVaryDirection = direction;
+ if (!ticks) {
+ // if no ticks are given, jump directly to destination
+ _palVaryDirection = stepStop;
+ ticks = 1;
+ }
// Call signal increase every [ticks]
g_sci->getTimerManager()->installTimerProc(&palVaryCallback, 1000000 / 60 * ticks, this);
}