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/agos/animation.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index c73f46fa93..3be552a083 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -273,10 +273,9 @@ void MoviePlayerDXA::stopVideo() {
 
 void MoviePlayerDXA::startSound() {
 	byte *buffer;
-	uint32 offset, size, tag;
+	uint32 offset, size;
 
-	tag = _fileStream->readUint32BE();
-	if (tag == MKID_BE('WAVE')) {
+	if (getSoundTag() == MKID_BE('WAVE')) {
 		size = _fileStream->readUint32BE();
 
 		if (_sequenceNum) {
@@ -322,7 +321,7 @@ void MoviePlayerDXA::nextFrame() {
 	}
 
 	if (_vm->_interactiveVideo == TYPE_LOOPING && getCurFrame() == getFrameCount()) {
-		_fileStream->seek(_videoInfo.frameOffs);
+		_fileStream->seek(_videoInfo.firstframeOffset);
 		_videoInfo.currentFrame = 0;
 		startSound();
 	}
@@ -445,7 +444,7 @@ void MoviePlayerSMK::handleNextFrame() {
 
 void MoviePlayerSMK::nextFrame() {
 	if (_vm->_interactiveVideo == TYPE_LOOPING && getCurFrame() == getFrameCount()) {
-		_fileStream->seek(_videoInfo.frameOffs);
+		_fileStream->seek(_videoInfo.firstframeOffset);
 		_videoInfo.currentFrame = 0;
 	}
 
-- 
cgit v1.2.3