[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.6,1.7 script_v6.cpp,1.45,1.46 script_v8.cpp,2.127,2.128 sound.cpp,1.75,1.76
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Jan 25 04:14:03 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv24428/scumm
Modified Files:
imuse_digi.cpp script_v6.cpp script_v8.cpp sound.cpp
Log Message:
applied patch #674141: CMI: Smush sync tuning
Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- imuse_digi.cpp 9 Jan 2003 08:23:44 -0000 1.6
+++ imuse_digi.cpp 25 Jan 2003 12:13:41 -0000 1.7
@@ -44,7 +44,7 @@
_channel[l]._initialized = false;
}
_scumm->_mixer->beginSlots(MAX_DIGITAL_CHANNELS + 1);
- _scumm->_timer->installProcedure(imus_digital_handler, 200);
+ _scumm->_timer->installProcedure(imus_digital_handler, 200000);
_pause = false;
}
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- script_v6.cpp 16 Jan 2003 17:37:34 -0000 1.45
+++ script_v6.cpp 25 Jan 2003 12:13:41 -0000 1.46
@@ -2482,11 +2482,11 @@
// }
uint32 speed;
if (strcmp((char*)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
- speed = 71;
+ speed = 71000;
else {
if (_smushFrameRate == 0)
_smushFrameRate = 14;
- speed = 1000 / _smushFrameRate;
+ speed = 1000000 / _smushFrameRate;
}
debug(1, "INSANE Arg: %d", args[1]);
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.127
retrieving revision 2.128
diff -u -d -r2.127 -r2.128
--- script_v8.cpp 20 Jan 2003 06:35:34 -0000 2.127
+++ script_v8.cpp 25 Jan 2003 12:13:41 -0000 2.128
@@ -1368,7 +1368,7 @@
warning("o8_startVideo(%s/%s)", getGameDataPath(), (char*)_scriptPointer);
- ScummRenderer * sr = new ScummRenderer(this, 83);
+ ScummRenderer * sr = new ScummRenderer(this, 83333);
SmushPlayer * sp = new SmushPlayer(sr);
if (_noSubtitles)
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- sound.cpp 24 Jan 2003 06:41:10 -0000 1.75
+++ sound.cpp 25 Jan 2003 12:13:41 -0000 1.76
@@ -993,7 +993,7 @@
_bundleMusicTrack = -1;
_numberSamplesBundleMusic = _scumm->_bundle->getNumberOfMusicSamplesByName(song);
_nameBundleMusic = song;
- _scumm->_timer->installProcedure(&music_handler, 1000);
+ _scumm->_timer->installProcedure(&music_handler, 1000000);
return;
}
if (strcmp(_nameBundleMusic, song) != 0) {
@@ -1376,7 +1376,7 @@
_scumm->_timer->releaseProcedure(&cd_timer_handler);
_cd_timer_value = _scumm->_vars[_scumm->VAR_MI1_TIMER];
- _scumm->_timer->installProcedure(&cd_timer_handler, timer_interval);
+ _scumm->_timer->installProcedure(&cd_timer_handler, 1000 * timer_interval);
}
void Sound::stopCDTimer()
More information about the Scummvm-git-logs
mailing list