MADS: Implemented sequence list, improvements for sprite assets

1 files changed, 115 insertions, 26 deletions

diff --git a/engines/mads/assets.cpp b/engines/mads/assets.cpp
index f7188e9551..c968afc311 100644
--- a/engines/mads/assets.cpp
+++ b/engines/mads/assets.cpp
@@ -25,72 +25,161 @@
 #include "mads/assets.h"
 #include "mads/compression.h"
 #include "mads/events.h"
+#include "mads/palette.h"
 
 namespace MADS {
 
-SpriteAsset::SpriteAsset(MADSEngine *vm, const Common::String &resourceName, int flags):
-		_vm(vm) {
+SpriteAsset::SpriteAsset(MADSEngine *vm, const Common::String &resourceName, int flags) :
+	_vm(vm) {
 	Common::String resName = resourceName;
 	if (!resName.hasSuffix(".SS"))
 		resName += ".SS";
-	
+
 	File file(resName);
-	MadsPack sprites(&file);
+	load(&file, flags);
+
+	file.close();
+}
+	
+SpriteAsset::SpriteAsset(MADSEngine *vm, Common::SeekableReadStream *stream, int flags) :
+		_vm(vm) {
+	load(stream, flags);
+}
 
+void SpriteAsset::load(Common::SeekableReadStream *stream, int flags) {
 	int curFrame = 0;
 	uint32 frameOffset = 0;
+	MadsPack sprite(stream);
 	_frameRate = 0;
 	_pixelSpeed = 0;
 	_maxWidth = 0;
 	_maxHeight = 0;
 
-	Common::SeekableReadStream *spriteStream = sprites.getItemStream(0);
-	for (int i = 0; i < 19; i++) {
-		spriteStream->readUint16LE();
-	}
+	Common::SeekableReadStream *spriteStream = sprite.getItemStream(0);
+	_mode = spriteStream->readByte();
+	spriteStream->skip(1);
+	int type1 = spriteStream->readUint16LE();
+	int type2 = spriteStream->readUint16LE();
+	_isBackground = (type1 != 0) && (type2 < 4);
+	spriteStream->skip(32);
 	_frameCount = spriteStream->readUint16LE();
 
+	if ((flags & SPRITE_SET_CHAR_INFO) == 0)
+		_charInfo = nullptr;
+	else
+		_charInfo = new SpriteSetCharInfo(spriteStream);
+
+	delete spriteStream;
+
 	// Get the palette data
-	spriteStream = sprites.getItemStream(2);
+	spriteStream = sprite.getItemStream(2);
 	int numColors = 0;
 	byte *palData = _vm->_palette->decodePalette(spriteStream, &numColors);
-
 	Common::copy(palData, &palData[numColors], &_palette[0]);
-	if (numColors < 256) 
-		Common::fill(&_palette[numColors * 3], &_palette[PALETTE_SIZE], 0);
+	if (numColors < 256)
+		Common::fill((byte *)&_palette[numColors], (byte *)&_palette[256], 0);
 	_colorCount = numColors;
 	delete[] palData;
 	delete spriteStream;
 
-	Common::SeekableReadStream *spriteDataStream = sprites.getItemStream(3);
-
+	spriteStream = sprite.getItemStream(1);
+	Common::SeekableReadStream *spriteDataStream = sprite.getItemStream(3);
 	SpriteAssetFrame frame;
+	Common::Array<int> frameSizes;
 	for (curFrame = 0; curFrame < _frameCount; curFrame++) {
-		frame.comp = 0;
+		frame._stream = 0;
+		frame._comp = 0;
 		frameOffset = spriteStream->readUint32LE();
 		_frameOffsets.push_back(frameOffset);
-		spriteStream->readUint32LE();	// frame size
-		frame.x = spriteStream->readUint16LE();
-		frame.y = spriteStream->readUint16LE();
-		frame.w = spriteStream->readUint16LE();
-		frame.h = spriteStream->readUint16LE();
-		if (curFrame == 0) {
-			debugN(kDebugGraphics, "%i frames, x = %i, y = %i, w = %i, h = %i\n", 
-				_frameCount, frame.x, frame.y, frame.w, frame.h);
+		uint32 frameSize = spriteStream->readUint32LE();
+		frameSizes.push_back(frameSize);
+
+		frame._bounds.left = spriteStream->readSint16LE();
+		frame._bounds.top  = spriteStream->readSint16LE();
+		frame._bounds.setWidth(spriteStream->readUint16LE());
+		frame._bounds.setHeight(spriteStream->readUint16LE());
+
+		if (curFrame == 0)
+			debugC(1, kDebugGraphics, "%i frames, x = %i, y = %i, w = %i, h = %i\n", 
+			_frameCount, frame._bounds.left, frame._bounds.top, 
+			frame._bounds.width(), frame._bounds.height());
+
+		if (_mode == 0) {
+			// Create a frame and decompress the raw pixel data
+			uint32 currPos = (uint32)spriteDataStream->pos();
+			frame._frame = new MSprite(spriteDataStream, 
+				Common::Point(frame._bounds.left, frame._bounds.top),
+				frame._bounds.width(), frame._bounds.height(), false);
+			assert((uint32)spriteDataStream->pos() == (currPos + frameSize));
 		}
 
-		frame.frame = new MSprite(spriteDataStream, Common::Point(frame.x, frame.y), 
-			frame.w, frame.h, false);
 		_frames.push_back(frame);
 	}
 
+	if (_mode != 0) {
+		// Handle decompressing Fab encoded data
+		for (curFrame = 0; curFrame < _frameCount; curFrame++) {
+			FabDecompressor fab;
+
+			int srcSize = (curFrame == (_frameCount - 1)) ? spriteDataStream->size() - _frameOffsets[curFrame] :
+				_frameOffsets[curFrame + 1] - _frameOffsets[curFrame];
+			byte *srcData = new byte[srcSize];
+			assert(srcData);
+			spriteDataStream->read(srcData, srcSize);
+
+			byte *destData = new byte[frameSizes[curFrame]];
+			assert(destData);
+
+			fab.decompress(srcData, srcSize, destData, frameSizes[curFrame]);
+
+			// Load the frame
+			Common::MemoryReadStream *rs = new Common::MemoryReadStream(destData, frameSizes[curFrame]);
+			_frames[curFrame]._frame = new MSprite(rs, 
+				Common::Point(_frames[curFrame]._bounds.left, _frames[curFrame]._bounds.top),
+				_frames[curFrame]._bounds.width(), _frames[curFrame]._bounds.height(), false);
+			delete rs;
+
+			delete[] srcData;
+			delete[] destData;
+		}
+	}
+
+	delete spriteStream;
 	delete spriteDataStream;
-	file.close();
 }
 
+MSprite *SpriteAsset::getFrame(int frameIndex) {
+	if ((uint)frameIndex < _frames.size()) {
+		return _frames[frameIndex]._frame;
+	} else {
+		debugC(kDebugGraphics, "SpriteAsset::getFrame: Invalid frame %d, out of %d", frameIndex, _frames.size());
+		return _frames[_frames.size() - 1]._frame;
+	}
+}
+
+
 void SpriteAsset::drawScaled(int frameNumber, MSurface &depthSurface, MSurface &destSurface,
 		int scale, int depth, const Common::Point &pos) {
 	warning("TODO: SpriteAsset::drawScaled");
 }
 
+/*------------------------------------------------------------------------*/
+
+SpriteSetCharInfo::SpriteSetCharInfo(Common::SeekableReadStream *s) {
+	_totalFrames = s->readByte();
+	s->skip(1);
+	_numEntries = s->readUint16LE();
+
+	for (int i = 0; i < 16; ++i)
+		_frameList[i] = s->readUint16LE();
+	for (int i = 0; i < 16; ++i)
+		_frameList2[i] = s->readUint16LE();
+	for (int i = 0; i < 16; ++i)
+		_ticksList[i] = s->readUint16LE();
+
+	_unk1 = s->readUint16LE();
+	_ticksAmount = s->readByte();
+	_yScale = s->readByte();
+}
+
 } // End of namespace MADS