aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/assets.h
diff options
context:
space:
mode:
authorPaul Gilbert2010-05-23 07:20:40 +0000
committerPaul Gilbert2010-05-23 07:20:40 +0000
commitdd9bf70761f2de9771912984209422f1f63bd3e8 (patch)
tree95923436f2aa71a906a1509d70b05c987938bb3d /engines/m4/assets.h
parent7a6a2a62eebfea5f09bf86fee3935e1ad031959d (diff)
downloadscummvm-rg350-dd9bf70761f2de9771912984209422f1f63bd3e8.tar.gz
scummvm-rg350-dd9bf70761f2de9771912984209422f1f63bd3e8.tar.bz2
scummvm-rg350-dd9bf70761f2de9771912984209422f1f63bd3e8.zip
Major work done on the animation and support classes to match the original
svn-id: r49150
Diffstat (limited to 'engines/m4/assets.h')
-rw-r--r--engines/m4/assets.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/m4/assets.h b/engines/m4/assets.h
index 7b0ce24dc4..cd0ae6ba78 100644
--- a/engines/m4/assets.h
+++ b/engines/m4/assets.h
@@ -113,6 +113,7 @@ public:
int32 getFrameHeight(int index);
int32 getMaxFrameWidth() const { return _maxWidth; }
int32 getMaxFrameHeight() const { return _maxHeight; }
+ uint16 getAssetType() const { return _assetType; }
M4Sprite *getFrame(int frameIndex);
void loadStreamingFrame(M4Sprite *frame, int frameIndex, int destX, int destY);
RGB8* getPalette() { return _palette; }
@@ -123,6 +124,7 @@ public:
int32 getFrameSize(int index);
M4Sprite *operator[](int index) { return getFrame(index); }
protected:
+ Common::SeekableReadStream *_stream;
RGB8 _palette[256];
uint32 _colorCount;
uint32 _srcSize;
@@ -132,7 +134,10 @@ protected:
Common::Array<uint32> _frameOffsets;
Common::Array<SpriteAssetFrame> _frames;
uint32 _frameStartOffset;
- Common::SeekableReadStream *_stream;
+
+ // MADS sprite set fields
+ uint16 _assetType;
+
int32 parseSprite(bool isBigEndian = false);
void loadFrameHeader(SpriteAssetFrame &frameHeader, bool isBigEndian = false);
private: