diff options
| author | Torbjörn Andersson | 2005-06-11 15:25:38 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-06-11 15:25:38 +0000 |
| commit | a2c90de0dbfcf5d859fb3790780e220dbf029be0 (patch) | |
| tree | 147107082be8fe3a2ac6a43a6bff2812f4713c94 /scumm/script_v6.cpp | |
| parent | 234b79396a47c1a6de29cd2b6661a8377b2889f7 (diff) | |
| download | scummvm-rg350-a2c90de0dbfcf5d859fb3790780e220dbf029be0.tar.gz scummvm-rg350-a2c90de0dbfcf5d859fb3790780e220dbf029be0.tar.bz2 scummvm-rg350-a2c90de0dbfcf5d859fb3790780e220dbf029be0.zip | |
Cleanup.
svn-id: r18375
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 47dc0974fb..02548ed5f8 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2493,18 +2493,16 @@ void ScummEngine_v6::o6_kernelSetFunctions() { break; #ifndef DISABLE_SCUMM_7_8 case 6: { - uint32 speed; if (_smushFrameRate == 0) _smushFrameRate = 14; - speed = 1000000 / _smushFrameRate; // SMUSH movie playback if (args[1] == 0) { assert(getStringAddressVar(VAR_VIDEONAME)); if (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0) - speed = 1000000 / 14; + _smushFrameRate = 14; - SmushPlayer *sp = new SmushPlayer(this, speed); + SmushPlayer *sp = new SmushPlayer(this, _smushFrameRate); // Correct incorrect smush filename in Macintosh FT demo if ((_gameId == GID_FT) && (_features & GF_DEMO) && (_platform == Common::kPlatformMacintosh) && @@ -2518,7 +2516,7 @@ void ScummEngine_v6::o6_kernelSetFunctions() { ? 232 : 233; _insaneRunning = true; - _insane->setSmushParams(speed); + _insane->setSmushParams(_smushFrameRate); _insane->runScene(insaneVarNum); _insaneRunning = false; } |