diff options
| author | Paul Gilbert | 2010-06-04 12:51:06 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2010-06-04 12:51:06 +0000 |
| commit | 3d98f679e72b5dcf16d4c85a286bdaf5a35c95a6 (patch) | |
| tree | 6866f3c4728f3ad52e5586120671acaf44d7b811 /engines/m4/animation.cpp | |
| parent | 86462c66a04fd208716f072d4ba0028a04bf9ad8 (diff) | |
| download | scummvm-rg350-3d98f679e72b5dcf16d4c85a286bdaf5a35c95a6.tar.gz scummvm-rg350-3d98f679e72b5dcf16d4c85a286bdaf5a35c95a6.tar.bz2 scummvm-rg350-3d98f679e72b5dcf16d4c85a286bdaf5a35c95a6.zip | |
Bugfix for the loading of the animation frame list
svn-id: r49427
Diffstat (limited to 'engines/m4/animation.cpp')
| -rw-r--r-- | engines/m4/animation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/animation.cpp b/engines/m4/animation.cpp index 43823c5ff1..55566aad7e 100644 --- a/engines/m4/animation.cpp +++ b/engines/m4/animation.cpp @@ -154,11 +154,12 @@ void MadsAnimation::initialise(const Common::String &filename, uint16 flags, M4S AnimFrameEntry rec; rec.frameNumber = animStream->readUint16LE(); rec.seqIndex = animStream->readByte(); + rec.spriteSlot.spriteListIndex = animStream->readByte(); rec.spriteSlot.frameNumber = animStream->readUint16LE(); rec.spriteSlot.xp = animStream->readUint16LE(); rec.spriteSlot.yp = animStream->readUint16LE(); - rec.spriteSlot.depth = animStream->readUint16LE(); - rec.spriteSlot.scale = animStream->readUint16LE(); + rec.spriteSlot.depth = animStream->readByte(); + rec.spriteSlot.scale = animStream->readByte(); _frameEntries.push_back(rec); } @@ -266,7 +267,6 @@ void MadsAnimation::update() { // If it's not time for the next frame, then exit if (_madsVm->_currentTimer < _nextFrameTimer) return; -return;//*** TODO: This routine still needs to be properly tested // Loop checks for any prior animation sprite slots to be expired for (int slotIndex = 0; slotIndex < _view->_spriteSlots.startIndex; ++slotIndex) { |