diff options
| author | Filippos Karapetis | 2009-05-20 10:43:18 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-05-20 10:43:18 +0000 |
| commit | 6ec870303ff3532873f652fb1a565d72b0079645 (patch) | |
| tree | 2acf20a4ae5d4deac4be47e3518c20409089f8bb /engines/agos | |
| parent | caf9bf0941babc523be7c37bb10bfbb2213f5c0b (diff) | |
| download | scummvm-rg350-6ec870303ff3532873f652fb1a565d72b0079645.tar.gz scummvm-rg350-6ec870303ff3532873f652fb1a565d72b0079645.tar.bz2 scummvm-rg350-6ec870303ff3532873f652fb1a565d72b0079645.zip | |
- 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
Diffstat (limited to 'engines/agos')
| -rw-r--r-- | engines/agos/animation.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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; } |