aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTravis Howell2009-05-10 06:54:45 +0000
committerTravis Howell2009-05-10 06:54:45 +0000
commit6b6aca3fa314cf43d79f6957b71d046243022f95 (patch)
tree13b055451aab3357cee5c1d93ab73200fff5667c /engines/scumm
parent4f0811b129fc7363c339e036e46b417407dcbbed (diff)
downloadscummvm-rg350-6b6aca3fa314cf43d79f6957b71d046243022f95.tar.gz
scummvm-rg350-6b6aca3fa314cf43d79f6957b71d046243022f95.tar.bz2
scummvm-rg350-6b6aca3fa314cf43d79f6957b71d046243022f95.zip
Change the work around for sq3.san, so it doesn't alter global smush frame rate (Which is a regression).
svn-id: r40408
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/script_v6.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index a7be872659..1b836be445 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2459,13 +2459,14 @@ void ScummEngine_v7::o6_kernelSetFunctions() {
if (args[1] == 0) {
const char *videoname = (const char *)getStringAddressVar(VAR_VIDEONAME);
assert(videoname);
- if (strcmp(videoname, "sq3.san") == 0)
- _smushFrameRate = 14;
// Correct incorrect smush filename in Macintosh FT demo
if ((_game.id == GID_FT) && (_game.features & GF_DEMO) && (_game.platform == Common::kPlatformMacintosh) &&
- (strcmp(videoname, "jumpgorge.san") == 0))
+ (!strcmp(videoname, "jumpgorge.san")))
_splayer->play("jumpgorg.san", _smushFrameRate);
+ // TODO: Document exactly why this is required
+ else if (_game.id == GID_DIG && !strcmp(videoname, "sq3.san"))
+ _splayer->play(videoname, 14);
else
_splayer->play(videoname, _smushFrameRate);