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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Aug 11 00:18:18 CEST 2009


Revision: 43230
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43230&view=rev
Author:   lordhoto
Date:     2009-08-10 22:18:18 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
Cleanup.

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	2009-08-10 21:30:16 UTC (rev 43229)
+++ scummvm/trunk/engines/kyra/wsamovie.cpp	2009-08-10 22:18:18 UTC (rev 43230)
@@ -75,11 +75,10 @@
 	}
 
 	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 @@
 	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 @@
 	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;

Modified: scummvm/trunk/engines/kyra/wsamovie.h
===================================================================
--- scummvm/trunk/engines/kyra/wsamovie.h	2009-08-10 21:30:16 UTC (rev 43229)
+++ scummvm/trunk/engines/kyra/wsamovie.h	2009-08-10 22:18:18 UTC (rev 43230)
@@ -85,6 +85,7 @@
 		WF_OFFSCREEN_DECODE = 0x10,
 		WF_NO_LAST_FRAME = 0x20,
 		WF_NO_FIRST_FRAME = 0x40,
+		WF_FLIPPED = 0x80,
 		WF_HAS_PALETTE = 0x100,
 		WF_XOR = 0x200
 	};


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




More information about the Scummvm-git-logs mailing list