diff options
| author | Max Horn | 2010-01-11 10:17:23 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-11 10:17:23 +0000 |
| commit | 87cdc86580625abc12bbd4fde71764e4fd88a357 (patch) | |
| tree | fd6624a748eefbfab84f55621393ad877e89e5a9 /engines/made/scriptfuncs.cpp | |
| parent | 5b043140ff0fdb621cde86c173621eab1f4556c8 (diff) | |
| download | scummvm-rg350-87cdc86580625abc12bbd4fde71764e4fd88a357.tar.gz scummvm-rg350-87cdc86580625abc12bbd4fde71764e4fd88a357.tar.bz2 scummvm-rg350-87cdc86580625abc12bbd4fde71764e4fd88a357.zip | |
MADE: Use Mixer::getElapsedTime and Audio::Timestamp instead of Mixer::getSoundElapsedTime
svn-id: r47243
Diffstat (limited to 'engines/made/scriptfuncs.cpp')
| -rw-r--r-- | engines/made/scriptfuncs.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp index 2e5636d908..88bd440c51 100644 --- a/engines/made/scriptfuncs.cpp +++ b/engines/made/scriptfuncs.cpp @@ -652,7 +652,8 @@ int16 ScriptFunctions::sfGetSoundEnergy(int16 argc, int16 *argv) { if (_vm->_mixer->isSoundHandleActive(_audioStreamHandle) && _vm->_soundEnergyArray) { while (_vm->_soundEnergyIndex < _vm->_soundEnergyArray->size()) { SoundEnergyItem *soundEnergyItem = &(*_vm->_soundEnergyArray)[_vm->_soundEnergyIndex]; - if (((_vm->_soundRate / 1000) * _vm->_mixer->getSoundElapsedTime(_audioStreamHandle)) < soundEnergyItem->position) { + const Audio::Timestamp ts = _vm->_mixer->getElapsedTime(_audioStreamHandle); + if (ts.convertToFramerate(_vm->_soundRate).totalNumberOfFrames() < soundEnergyItem->position) { result = soundEnergyItem->energy; break; } |