diff options
| author | Travis Howell | 2009-05-10 06:46:24 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-05-10 06:46:24 +0000 |
| commit | 4f0811b129fc7363c339e036e46b417407dcbbed (patch) | |
| tree | 15f5244b8588dc2eb564db9561f24dd04ccc62f6 /engines/scumm | |
| parent | f5094553f7690265f3786c59f38b99c70bd6c311 (diff) | |
| download | scummvm-rg350-4f0811b129fc7363c339e036e46b417407dcbbed.tar.gz scummvm-rg350-4f0811b129fc7363c339e036e46b417407dcbbed.tar.bz2 scummvm-rg350-4f0811b129fc7363c339e036e46b417407dcbbed.zip | |
Correct and move initial SMUSH frame rate value, for the demo version of The Dig.
svn-id: r40407
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/script_v6.cpp | 3 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index 3406f50dd2..a7be872659 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -2455,9 +2455,6 @@ void ScummEngine_v7::o6_kernelSetFunctions() { grabCursor(args[1], args[2], args[3], args[4]); break; case 6: { - if (_smushFrameRate == 0) - _smushFrameRate = 14; - // SMUSH movie playback if (args[1] == 0) { const char *videoname = (const char *)getStringAddressVar(VAR_VIDEONAME); diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 67ba958838..0536f11039 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1207,7 +1207,10 @@ void ScummEngine::setupScumm() { #ifdef ENABLE_SCUMM_7_8 void ScummEngine_v7::setupScumm() { - _smushFrameRate = (_game.id == GID_FT) ? 10 : 12; + if (_game.id == GID_DIG && (_game.features & GF_DEMO)) + _smushFrameRate = 15; + else + _smushFrameRate = (_game.id == GID_FT) ? 10 : 12; _musicEngine = _imuseDigital = new IMuseDigital(this, _mixer, 10); |