diff options
| author | Paul Gilbert | 2013-12-30 07:45:44 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2013-12-30 07:45:44 +1100 |
| commit | c4197b4e30a321c36488494d66a3fb99e0002780 (patch) | |
| tree | 12115f9fbef91df1becc34808bf574c9a6a61e14 /engines | |
| parent | beb64fe5278c7a97bb52499446a868ad2ec81d77 (diff) | |
| download | scummvm-rg350-c4197b4e30a321c36488494d66a3fb99e0002780.tar.gz scummvm-rg350-c4197b4e30a321c36488494d66a3fb99e0002780.tar.bz2 scummvm-rg350-c4197b4e30a321c36488494d66a3fb99e0002780.zip | |
VOYEUR: Move _isRLV3 flag to animation header class
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/voyeur/animation.cpp | 4 | ||||
| -rw-r--r-- | engines/voyeur/animation.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp index 0fce36d54b..2f8c71bf68 100644 --- a/engines/voyeur/animation.cpp +++ b/engines/voyeur/animation.cpp @@ -115,6 +115,7 @@ void RL2Decoder::RL2FileHeader::load(Common::SeekableReadStream *stream) { _form = stream->readUint32LE(); _backSize = stream->readUint32LE(); _signature = stream->readUint32LE(); + _isRLV3 = !strncmp((const char *)&_signature, "RLV3", 4); if (!isValid()) return; @@ -163,8 +164,9 @@ RL2Decoder::RL2VideoTrack::RL2VideoTrack(const RL2FileHeader &header, RL2AudioTr _surface = new Graphics::Surface(); _surface->create(320, 200, Graphics::PixelFormat::createFormatCLUT8()); + _hasBackFrame = header._backSize != 0 && !header._isRLV3; + _backSurface = NULL; - _hasBackFrame = header._backSize != 0 && strncmp((char *)&header._signature, "RLV3", 4); if (_hasBackFrame) initBackSurface(); diff --git a/engines/voyeur/animation.h b/engines/voyeur/animation.h index bb3f34a461..60d4830cf1 100644 --- a/engines/voyeur/animation.h +++ b/engines/voyeur/animation.h @@ -58,6 +58,7 @@ private: uint32 *_frameOffsets; int *_frameSoundSizes; + bool _isRLV3; public: RL2FileHeader(); ~RL2FileHeader(); |