[Scummvm-cvs-logs] SF.net SVN: scummvm:[49427] scummvm/trunk/engines/m4/animation.cpp

[dreammaster at users.sourceforge.net]

Revision: 49427
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49427&view=rev
Author:   dreammaster
Date:     2010-06-04 12:51:06 +0000 (Fri, 04 Jun 2010)

Log Message:
-----------
Bugfix for the loading of the animation frame list

Modified Paths:
--------------
    scummvm/trunk/engines/m4/animation.cpp

Modified: scummvm/trunk/engines/m4/animation.cpp
===================================================================
--- scummvm/trunk/engines/m4/animation.cpp	2010-06-04 11:28:30 UTC (rev 49426)
+++ scummvm/trunk/engines/m4/animation.cpp	2010-06-04 12:51:06 UTC (rev 49427)
@@ -154,11 +154,12 @@
 			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 @@
 	// 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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.