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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Jun 29 20:49:28 CEST 2009


Revision: 41961
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41961&view=rev
Author:   lordhoto
Date:     2009-06-29 18:49:28 +0000 (Mon, 29 Jun 2009)

Log Message:
-----------
Fix palette regression caused by r41949.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_mr.cpp

Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp	2009-06-29 18:49:17 UTC (rev 41960)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp	2009-06-29 18:49:28 UTC (rev 41961)
@@ -899,9 +899,9 @@
 		for (int i = 144; i < 168; ++i) {
 			for (int j = 0; j <  3; ++j) {
 				uint8 col = dst[i * 3 + j];
-				uint8 subCol = src[(i - 144) * 3 + j] + sceneDatPal[j];
-				subCol = CLIP<uint8>(subCol, 0, 63);
-				subCol = (col - subCol) >> 1;
+				int subCol = src[(i - 144) * 3 + j] + sceneDatPal[j];
+				subCol = CLIP(subCol, 0, 63);
+				subCol = (col - subCol) / 2;
 				dst[i * 3 + j] -= subCol;
 			}
 		}
@@ -914,8 +914,8 @@
 
 		for (int i = 144; i < 168; ++i) {
 			for (int j = 0; j < 3; ++j) {
-				uint8 col = dst[i * 3 + j] + sceneDatPal[j];
-				dst[i * 3 + j] = CLIP<uint8>(col, 0, 63);
+				int col = dst[i * 3 + j] + sceneDatPal[j];
+				dst[i * 3 + j] = CLIP(col, 0, 63);
 			}
 		}
 


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