diff options
| author | Johannes Schickel | 2009-08-10 22:18:18 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-08-10 22:18:18 +0000 |
| commit | a8f5f651a51dc1ebbbbaa33b5610009360af0ac1 (patch) | |
| tree | 5b6acabfdb6ad5c947f94793d0cdc0a492fe1811 /engines/kyra | |
| parent | eaed41215284ac34cc3c70ad4693a241a70eb780 (diff) | |
| download | scummvm-rg350-a8f5f651a51dc1ebbbbaa33b5610009360af0ac1.tar.gz scummvm-rg350-a8f5f651a51dc1ebbbbaa33b5610009360af0ac1.tar.bz2 scummvm-rg350-a8f5f651a51dc1ebbbbaa33b5610009360af0ac1.zip | |
Cleanup.
svn-id: r43230
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/wsamovie.cpp | 13 | ||||
| -rw-r--r-- | engines/kyra/wsamovie.h | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp index 0aaeebc589..b221f869b7 100644 --- a/engines/kyra/wsamovie.cpp +++ b/engines/kyra/wsamovie.cpp @@ -75,11 +75,10 @@ int WSAMovie_v1::open(const char *filename, int offscreenDecode, Palette *palBuf } if (_numFrames & 0x8000) { - // This is used in the Amiga version, the wsa playing code - // doesn't include any handling of it though, so we disable - // this warning for now. - //warning("Unhandled wsa flags 0x80"); - _flags |= 0x80; + // This is used in the Amiga version. + if (_vm->gameFlags().platform != Common::kPlatformAmiga) + warning("Unhandled wsa flags 0x8000"); + _flags |= WF_FLIPPED; _numFrames &= 0x7FFF; } _currentFrame = _numFrames; @@ -262,7 +261,7 @@ void WSAMovieAmiga::displayFrame(int frameNum, int pageNum, int x, int y, uint16 if (_currentFrame == _numFrames) { if (!(_flags & WF_NO_FIRST_FRAME)) { Screen::decodeFrameDelta(dst, _deltaBuffer, true); - Screen::convertAmigaGfx(dst, _width, _height, 5, true); + Screen::convertAmigaGfx(dst, _width, _height, 5, (_flags & WF_FLIPPED) != 0); if (_flags & WF_OFFSCREEN_DECODE) { dst = _offscreenBuffer; @@ -341,7 +340,7 @@ void WSAMovieAmiga::processFrame(int frameNum, uint8 *dst) { const uint8 *src = _frameData + _frameOffsTable[frameNum]; Screen::decodeFrame4(src, _deltaBuffer, _deltaBufferSize); Screen::decodeFrameDelta(dst, _deltaBuffer, true); - Screen::convertAmigaGfx(dst, _width, _height, 5, true); + Screen::convertAmigaGfx(dst, _width, _height, 5, (_flags & WF_FLIPPED) != 0); src = dst; dst = 0; diff --git a/engines/kyra/wsamovie.h b/engines/kyra/wsamovie.h index 49ac5a28fe..957ee386ef 100644 --- a/engines/kyra/wsamovie.h +++ b/engines/kyra/wsamovie.h @@ -85,6 +85,7 @@ public: WF_OFFSCREEN_DECODE = 0x10, WF_NO_LAST_FRAME = 0x20, WF_NO_FIRST_FRAME = 0x40, + WF_FLIPPED = 0x80, WF_HAS_PALETTE = 0x100, WF_XOR = 0x200 }; |