From e8b6baca74228144694f4ff1d39f8e71330adc5e Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 3 Apr 2007 14:26:12 +0000 Subject: [PATCH] Little WSA loading fix. svn-id: r26375 --- engines/kyra/wsamovie.cpp | 7 +++---- engines/kyra/wsamovie.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp index 8ba0793f8ce..e0a6817d82c 100644 --- a/engines/kyra/wsamovie.cpp +++ b/engines/kyra/wsamovie.cpp @@ -146,7 +146,7 @@ void WSAMovieV1::displayFrame(int frameNum) { if (_flags & WF_OFFSCREEN_DECODE) { Screen::decodeFrameDelta(dst, _deltaBuffer); } else { - Screen::decodeFrameDeltaPage(dst, _deltaBuffer, _width, true); + Screen::decodeFrameDeltaPage(dst, _deltaBuffer, _width, (_flags & WF_XOR) == 0); } } _currentFrame = 0; @@ -384,9 +384,8 @@ int WSAMovieV2::open(const char *filename, int unk1, uint8 *palBuf) { } } - if (flags & 2) { - _flags |= WF_MASKED_BLIT; - } + if (flags & 2) + _flags |= WF_XOR; if (!(unk1 & 2)) { _flags |= WF_OFFSCREEN_DECODE; diff --git a/engines/kyra/wsamovie.h b/engines/kyra/wsamovie.h index 6744ba0715e..e9b84a0bbbf 100644 --- a/engines/kyra/wsamovie.h +++ b/engines/kyra/wsamovie.h @@ -71,10 +71,10 @@ public: virtual void displayFrame(int frameNum); enum WSAFlags { - WF_MASKED_BLIT = 0x1, WF_OFFSCREEN_DECODE = 0x10, WF_NO_FIRST_FRAME = 0x40, - WF_HAS_PALETTE = 0x100 + WF_HAS_PALETTE = 0x100, + WF_XOR = 0x200 }; protected: