Cleanup.

svn-id: r18375

3 files changed, 6 insertions, 8 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;
 				}
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 1381c66f13..39c5248954 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1195,7 +1195,7 @@ void ScummEngine_v8::o8_systemOps() {
 void ScummEngine_v8::o8_startVideo() {
 	int len = resStrLen(_scriptPointer);
 
-	SmushPlayer *sp = new SmushPlayer(this, 1000000 / 12);
+	SmushPlayer *sp = new SmushPlayer(this, 12);
 	sp->play((const char*)_scriptPointer);
 	delete sp;
 
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 379bb5d4f1..376ac78b46 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -284,7 +284,7 @@ void SmushPlayer::init() {
 	_vm->gdi._numStrips = _vm->virtscr[0].w / 8;
 	
 	_smixer = new SmushMixer(_vm->_mixer);
-	Common::g_timer->installTimerProc(&timerCallback, _speed, this);
+	Common::g_timer->installTimerProc(&timerCallback, 1000000 / _speed, this);
 
 	_initDone = true;
 }
@@ -961,7 +961,7 @@ void SmushPlayer::handleFrame(Chunk &b) {
 #endif
 	_smixer->handleFrame();
 
-	debugC(DEBUG_SMUSH, "Smush stats: FRME( %03d ), Limit(%d)", end_time - start_time, _speed / 1000);
+	debugC(DEBUG_SMUSH, "Smush stats: FRME( %03d ), Limit(%d)", end_time - start_time, _speed);
 
 	_frame++;
 }