[Scummvm-cvs-logs] SF.net SVN: scummvm: [25512] scummvm/trunk/engines/agos/icons.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Mon Feb 12 07:17:14 CET 2007


Revision: 25512
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25512&view=rev
Author:   kirben
Date:     2007-02-11 22:17:13 -0800 (Sun, 11 Feb 2007)

Log Message:
-----------
Fix icons regression in Amiga OCS version of Simon the Sorcerer 1.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/icons.cpp

Modified: scummvm/trunk/engines/agos/icons.cpp
===================================================================
--- scummvm/trunk/engines/agos/icons.cpp	2007-02-12 06:15:26 UTC (rev 25511)
+++ scummvm/trunk/engines/agos/icons.cpp	2007-02-12 06:17:13 UTC (rev 25512)
@@ -193,7 +193,8 @@
 		if (getPlatform() == Common::kPlatformAmiga) {
 			src = _iconFilePtr;
 			src += READ_BE_UINT32(&((uint32 *)src)[icon]);
-			decompressIconAmiga(dst, src, 24, 24, 240, _dxSurfacePitch);
+			uint8 color = (getFeatures() & GF_32COLOR) ? 16 : 240;
+			decompressIconAmiga(dst, src, 24, 24, color, _dxSurfacePitch);
 		} else {
 			src = _iconFilePtr;
 			src += READ_LE_UINT16(&((uint16 *)src)[icon]);
@@ -203,7 +204,7 @@
 		dst += (x + window->x) * 8;
 		dst += (y * 20 + window->y) * _dxSurfacePitch;
 
-		uint color = dst[0] & 0xF0;
+		uint8 color = dst[0] & 0xF0;
 
 		if (getPlatform() == Common::kPlatformAmiga) {
 			src = _iconFilePtr;


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