From 6ec870303ff3532873f652fb1a565d72b0079645 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 20 May 2009 10:43:18 +0000
Subject: - Reverted commit #40730, as it introduced rounding errors - Properly
 fixed the FLIC player - The sound chunk tag of DXA files is now read by the
 DXADecoder's loadFile() method

svn-id: r40736
---
 engines/sword1/animation.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'engines/sword1/animation.cpp')

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index c97d04d1d9..2d0d081ef6 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -144,15 +144,7 @@ bool MoviePlayer::load(uint32 id) {
 		break;
 	}
 
-	if (_decoder->loadFile(filename)) {
-		// The DXA animations in the Broken Sword games always use external audio tracks.
-		if (_decoderType == kVideoDecoderDXA && _decoder->readSoundHeader() != MKID_BE('NULL'))
-			return false;
-	} else {
-		return false;
-	}
-
-	return true;
+	return _decoder->loadFile(filename);
 }
 
 void MoviePlayer::play(void) {
@@ -244,7 +236,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;
 }
-- 
cgit v1.2.3