[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.102,1.103 script_v6.cpp,1.226,1.227 script_v8.cpp,2.211,2.212

Max Horn fingolfin at users.sourceforge.net
Sat Dec 27 08:42:02 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv16206

Modified Files:
	imuse_digi.cpp script_v6.cpp script_v8.cpp 
Log Message:
try to make it more obvious how certain timer freqs are derived

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- imuse_digi.cpp	27 Dec 2003 16:32:16 -0000	1.102
+++ imuse_digi.cpp	27 Dec 2003 16:40:01 -0000	1.103
@@ -672,7 +672,7 @@
 
 	_bundle = new Bundle();
 
-	_scumm->_timer->installTimerProc(timer_handler, 40000, this);
+	_scumm->_timer->installTimerProc(timer_handler, 1000000 / 25, this);
 }
 
 IMuseDigital::~IMuseDigital() {

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- script_v6.cpp	27 Dec 2003 15:22:59 -0000	1.226
+++ script_v6.cpp	27 Dec 2003 16:40:01 -0000	1.227
@@ -2405,9 +2405,9 @@
 		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;

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.211
retrieving revision 2.212
diff -u -d -r2.211 -r2.212
--- script_v8.cpp	27 Dec 2003 15:22:59 -0000	2.211
+++ script_v8.cpp	27 Dec 2003 16:40:01 -0000	2.212
@@ -1244,7 +1244,7 @@
 
 	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;
 





More information about the Scummvm-git-logs mailing list