From c0cc941ea4be1190f7a046c7c36b55918e907c31 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 27 Dec 2003 16:40:01 +0000
Subject: try to make it more obvious how certain timer freqs are derived

svn-id: r11974
---
 scumm/imuse_digi.cpp | 2 +-
 scumm/script_v6.cpp  | 6 +++---
 scumm/script_v8.cpp  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp
index e82088bd79..6d730d64dc 100644
--- a/scumm/imuse_digi.cpp
+++ b/scumm/imuse_digi.cpp
@@ -672,7 +672,7 @@ IMuseDigital::IMuseDigital(ScummEngine *scumm)
 
 	_bundle = new Bundle();
 
-	_scumm->_timer->installTimerProc(timer_handler, 40000, this);
+	_scumm->_timer->installTimerProc(timer_handler, 1000000 / 25, this);
 }
 
 IMuseDigital::~IMuseDigital() {
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 26057c800f..53b1245155 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -2405,9 +2405,9 @@ void ScummEngine_v6::o6_kernelSetFunctions() {
 		case 6: {
 				uint32 speed;
 				assert(getStringAddressVar(VAR_VIDEONAME));
-				if (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
-					speed = 71000;
-				else {
+				if (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0) {
+					speed = 1000000 / 14;
+				} else {
 					if (_smushFrameRate == 0) 
 						_smushFrameRate = 14;
 					speed = 1000000 / _smushFrameRate;
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 36cb2cfcc5..a88e65cf0c 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1244,7 +1244,7 @@ void ScummEngine_v8::o8_startVideo() {
 
 	debug(4, "o8_startVideo(%s/%s)", getGameDataPath(), (const char*)_scriptPointer);
 
-	SmushPlayer *sp = new SmushPlayer(this, 83333);
+	SmushPlayer *sp = new SmushPlayer(this, 1000000 / 12);
 	sp->play((const char*)_scriptPointer, getGameDataPath());
 	delete sp;
 
-- 
cgit v1.2.3