[Scummvm-cvs-logs] SF.net SVN: scummvm:[36219] scummvm/trunk/engines/tinsel

joostp at users.sourceforge.net joostp at users.sourceforge.net
Wed Feb 4 21:55:15 CET 2009


Revision: 36219
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36219&view=rev
Author:   joostp
Date:     2009-02-04 20:55:15 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
Fix palette on big endian

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/faders.cpp
    scummvm/trunk/engines/tinsel/polygons.cpp

Modified: scummvm/trunk/engines/tinsel/faders.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/faders.cpp	2009-02-04 19:52:00 UTC (rev 36218)
+++ scummvm/trunk/engines/tinsel/faders.cpp	2009-02-04 20:55:15 UTC (rev 36219)
@@ -117,7 +117,7 @@
 		// fade palette using next multiplier
 		if (TinselV2)
 			FadePalette(_ctx->fadeRGB, pFade->pPalQ->palRGB,
-				FROM_LE_32(pFade->pPalQ->numColours), (uint32) *_ctx->pColMult);
+				pFade->pPalQ->numColours, (uint32) *_ctx->pColMult);
 		else
 			FadePalette(_ctx->fadeRGB, _ctx->pPalette->palRGB,
 				FROM_LE_32(_ctx->pPalette->numColours), (uint32) *_ctx->pColMult);

Modified: scummvm/trunk/engines/tinsel/polygons.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/polygons.cpp	2009-02-04 19:52:00 UTC (rev 36218)
+++ scummvm/trunk/engines/tinsel/polygons.cpp	2009-02-04 20:55:15 UTC (rev 36219)
@@ -1041,8 +1041,8 @@
 	Poly pp(LockMem(pHandle), Polys[hPath]->pIndex);
 
 	// Path is of a constant brightness?
-	if (pp.bright1 == pp.bright2)
-		return pp.bright1;
+	if (FROM_LE_32(pp.bright1) == FROM_LE_32(pp.bright2))
+		return FROM_LE_32(pp.bright1);
 
 	assert(FROM_LE_32(pp.bright1) >= FROM_LE_32(pp.bright2));
 


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