diff options
Diffstat (limited to 'engines/sword2/animation.cpp')
| -rw-r--r-- | engines/sword2/animation.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 56f369a3eb..e0b8bcbe52 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -80,16 +80,7 @@ bool MoviePlayer::load(const char *name) { break; } - if (_decoder->loadFile(filename)) { - // The DXA animations in the Broken Sword games always use external audio tracks, - // if they have any sound at all. - if (_decoderType == kVideoDecoderDXA && _decoder->readSoundHeader() != MKID_BE('NULL')) - return false; - } else { - return false; - } - - return true; + return _decoder->loadFile(filename); } void MoviePlayer::play(MovieText *movieTexts, uint32 numMovieTexts, uint32 leadIn, uint32 leadOut) { @@ -280,7 +271,7 @@ int32 DXADecoderWithSound::getAudioLag() { int32 videoTime = _videoInfo.currentFrame * frameDelay; int32 audioTime; - audioTime = (int32) _mixer->getSoundElapsedTime(*_bgSoundHandle); + audioTime = (((int32) _mixer->getSoundElapsedTime(*_bgSoundHandle)) * 100); return videoTime - audioTime; } |