aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics
diff options
context:
space:
mode:
authorMartin Kiewitz2010-07-10 22:27:28 +0000
committerMartin Kiewitz2010-07-10 22:27:28 +0000
commitdf6ead5f93758aa9871594fc3872930eaf9c9d60 (patch)
tree1726168090f06594fd81eb43c5bfc0755f404cc2 /engines/sci/graphics
parent5721b75205acd15053430f24e92b8f170478ced0 (diff)
downloadscummvm-rg350-df6ead5f93758aa9871594fc3872930eaf9c9d60.tar.gz
scummvm-rg350-df6ead5f93758aa9871594fc3872930eaf9c9d60.tar.bz2
scummvm-rg350-df6ead5f93758aa9871594fc3872930eaf9c9d60.zip
SCI: calling speed throttler as well from kPalette(setIntensity) if needed - fixes kq6 intro
svn-id: r50794
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r--engines/sci/graphics/palette.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index b85281e9c4..7e9dc0ed31 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -411,7 +411,11 @@ void GfxPalette::kernelSetIntensity(uint16 fromColor, uint16 toColor, uint16 int
memset(&_sysPalette.intensity[0] + fromColor, intensity, toColor - fromColor);
if (setPalette) {
setOnScreen();
- g_sci->getEngineState()->_throttleTrigger = true;
+ EngineState *state = g_sci->getEngineState();
+ // Call speed throttler from here as well just in case we need it
+ // At least in kq6 intro the scripts call us in a tight loop for fadein/fadeout
+ state->speedThrottler(30);
+ state->_throttleTrigger = true;
}
}