diff options
| author | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
| commit | bca8ce861ad3439881fef0f916b592aafc4ee010 (patch) | |
| tree | caaa3d79b0b47624ef48a48248b63f765a5e0628 /engines/lastexpress/data/sequence.cpp | |
| parent | c1b5626bca1e0e08316353f1ead00ed763cd5380 (diff) | |
| parent | c839fd50b5ddfcceada8cbbd3046ce219df248a0 (diff) | |
| download | scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.gz scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.bz2 scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.zip | |
Merge remote-tracking branch 'origin/master' into wintermute
Diffstat (limited to 'engines/lastexpress/data/sequence.cpp')
| -rw-r--r-- | engines/lastexpress/data/sequence.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/lastexpress/data/sequence.cpp b/engines/lastexpress/data/sequence.cpp index a62348f6c0..a5bcba84cd 100644 --- a/engines/lastexpress/data/sequence.cpp +++ b/engines/lastexpress/data/sequence.cpp @@ -27,7 +27,6 @@ #include "lastexpress/debug.h" #include "common/stream.h" -#include "common/textconsole.h" namespace LastExpress { @@ -77,7 +76,7 @@ void FrameInfo::read(Common::SeekableReadStream *in, bool isSequence) { // AnimFrame -AnimFrame::AnimFrame(Common::SeekableReadStream *in, const FrameInfo &f) : _palette(NULL) { +AnimFrame::AnimFrame(Common::SeekableReadStream *in, const FrameInfo &f, bool ignoreSubtype) : _palette(NULL), _ignoreSubtype(ignoreSubtype) { _palSize = 1; // TODO: use just the needed rectangle _image.create(640, 480, Graphics::PixelFormat::createFormatCLUT8()); |