[Scummvm-cvs-logs] SF.net SVN: scummvm: [26375] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 26375
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26375&view=rev
Author:   lordhoto
Date:     2007-04-03 07:26:12 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Little WSA loading fix.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/wsamovie.cpp
    scummvm/trunk/engines/kyra/wsamovie.h

Modified: scummvm/trunk/engines/kyra/wsamovie.cpp
===================================================================
--- scummvm/trunk/engines/kyra/wsamovie.cpp	2007-04-02 21:00:11 UTC (rev 26374)
+++ scummvm/trunk/engines/kyra/wsamovie.cpp	2007-04-03 14:26:12 UTC (rev 26375)
@@ -146,7 +146,7 @@
 			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 @@
 		}
 	}
 	
-	if (flags & 2) {
-		_flags |= WF_MASKED_BLIT;
-	}
+	if (flags & 2)
+		_flags |= WF_XOR;
 	
 	if (!(unk1 & 2)) {
 		_flags |= WF_OFFSCREEN_DECODE;

Modified: scummvm/trunk/engines/kyra/wsamovie.h
===================================================================
--- scummvm/trunk/engines/kyra/wsamovie.h	2007-04-02 21:00:11 UTC (rev 26374)
+++ scummvm/trunk/engines/kyra/wsamovie.h	2007-04-03 14:26:12 UTC (rev 26375)
@@ -71,10 +71,10 @@
 	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:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.