thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

applied patch #674141: CMI: Smush sync tuning

Browse source 
svn-id: r6537
This commit is contained in:
Paweł Kołodziejski 2003-01-25 12:13:41 +00:00
parent 5f7cd1c93d
commit d942441f7f
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/timer.cpp
View file

@ -48,7 +48,7 @@ int Timer::handler(int * t) {
if (_timerRunning) { if (_timerRunning) {
_lastTime = _thisTime; _lastTime = _thisTime;
_thisTime = _engine->_system->get_msecs(); _thisTime = _engine->_system->get_msecs();
interval = _thisTime - _lastTime; interval = 1000 * (_thisTime - _lastTime);
for (l = 0; l < MAX_TIMERS; l++) { for (l = 0; l < MAX_TIMERS; l++) {
if ((_timerSlots[l].procedure) && (_timerSlots[l].interval > 0)) { if ((_timerSlots[l].procedure) && (_timerSlots[l].interval > 0)) {

2
scumm/imuse_digi.cpp
View file

@ -44,7 +44,7 @@ IMuseDigital::IMuseDigital(Scumm *scumm) {
_channel[l]._initialized = false; _channel[l]._initialized = false;
} }
_scumm->_mixer->beginSlots(MAX_DIGITAL_CHANNELS + 1); _scumm->_mixer->beginSlots(MAX_DIGITAL_CHANNELS + 1);
_scumm->_timer->installProcedure(imus_digital_handler, 200); _scumm->_timer->installProcedure(imus_digital_handler, 200000);
_pause = false; _pause = false;
} }

4
scumm/script_v6.cpp
View file

@ -2482,11 +2482,11 @@ void Scumm_v6::o6_kernelSetFunctions()
// } // }
uint32 speed; uint32 speed;
if (strcmp((char*)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0) if (strcmp((char*)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
speed = 71; speed = 71000;
else { else {
if (_smushFrameRate == 0) if (_smushFrameRate == 0)
_smushFrameRate = 14; _smushFrameRate = 14;
speed = 1000 / _smushFrameRate; speed = 1000000 / _smushFrameRate;
} }
debug(1, "INSANE Arg: %d", args[1]); debug(1, "INSANE Arg: %d", args[1]);

2
scumm/script_v8.cpp
View file

@ -1368,7 +1368,7 @@ void Scumm_v8::o8_startVideo()
warning("o8_startVideo(%s/%s)", getGameDataPath(), (char*)_scriptPointer); 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); SmushPlayer * sp = new SmushPlayer(sr);
if (_noSubtitles) if (_noSubtitles)

4
scumm/sound.cpp
View file

@ -993,7 +993,7 @@ void Sound::playBundleMusic(char * song) {
_bundleMusicTrack = -1; _bundleMusicTrack = -1;
_numberSamplesBundleMusic = _scumm->_bundle->getNumberOfMusicSamplesByName(song); _numberSamplesBundleMusic = _scumm->_bundle->getNumberOfMusicSamplesByName(song);
_nameBundleMusic = song; _nameBundleMusic = song;
_scumm->_timer->installProcedure(&music_handler, 1000); _scumm->_timer->installProcedure(&music_handler, 1000000);
return; return;
} }
if (strcmp(_nameBundleMusic, song) != 0) { if (strcmp(_nameBundleMusic, song) != 0) {
@ -1376,7 +1376,7 @@ void Sound::startCDTimer()
_scumm->_timer->releaseProcedure(&cd_timer_handler); _scumm->_timer->releaseProcedure(&cd_timer_handler);
_cd_timer_value = _scumm->_vars[_scumm->VAR_MI1_TIMER]; _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() void Sound::stopCDTimer()