diff options
| author | Filippos Karapetis | 2011-02-07 13:49:03 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2011-02-07 13:49:03 +0000 |
| commit | a0c0331bcdb9a0736c8b5fa85de18a0319c675a2 (patch) | |
| tree | 5cfd8379b6e1bee63b1ed1de65f1ff0c2f969c06 /engines/sci/video/seq_decoder.cpp | |
| parent | dda8266ec810d2e289e4d0f661078f60d69d9903 (diff) | |
| download | scummvm-rg350-a0c0331bcdb9a0736c8b5fa85de18a0319c675a2.tar.gz scummvm-rg350-a0c0331bcdb9a0736c8b5fa85de18a0319c675a2.tar.bz2 scummvm-rg350-a0c0331bcdb9a0736c8b5fa85de18a0319c675a2.zip | |
SCI: Unified the SEQ and robot palette code, and fixed the include safeguard of the SEQ decoder
svn-id: r55803
Diffstat (limited to 'engines/sci/video/seq_decoder.cpp')
| -rw-r--r-- | engines/sci/video/seq_decoder.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/sci/video/seq_decoder.cpp b/engines/sci/video/seq_decoder.cpp index 3f4bd458b8..106084d427 100644 --- a/engines/sci/video/seq_decoder.cpp +++ b/engines/sci/video/seq_decoder.cpp @@ -66,10 +66,15 @@ bool SeqDecoder::load(Common::SeekableReadStream *stream) { _frameCount = _fileStream->readUint16LE(); // Set palette - int paletteSize = _fileStream->readUint32LE(); + int paletteChunkSize = _fileStream->readUint32LE(); + readPaletteChunk(paletteChunkSize); - byte *paletteData = new byte[paletteSize]; - _fileStream->read(paletteData, paletteSize); + return true; +} + +void SeqDecoder::readPaletteChunk(uint16 chunkSize) { + byte *paletteData = new byte[chunkSize]; + _fileStream->read(paletteData, chunkSize); // SCI1.1 palette byte palFormat = paletteData[32]; @@ -89,7 +94,6 @@ bool SeqDecoder::load(Common::SeekableReadStream *stream) { _dirtyPalette = true; delete[] paletteData; - return true; } void SeqDecoder::close() { |