[Scummvm-cvs-logs] scummvm master -> bb29cdc899dcf48fb67b369273194dab32843665

m-kiewitz m_kiewitz at users.sourceforge.net
Tue Oct 28 22:41:16 CET 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bb29cdc899 SCI: color matching - remove debug code


Commit: bb29cdc899dcf48fb67b369273194dab32843665
    https://github.com/scummvm/scummvm/commit/bb29cdc899dcf48fb67b369273194dab32843665
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2014-10-28T22:41:14+01:00

Commit Message:
SCI: color matching - remove debug code

Changed paths:
    engines/sci/graphics/palette.cpp



diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 4d2c874..5058eaa 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -552,9 +552,6 @@ uint16 GfxPalette::matchColor(byte matchRed, byte matchGreen, byte matchBlue) {
 			differenceGreen = (uint8)ABS<int8>(_sysPalette.colors[colorNr].g - matchGreen);
 			differenceBlue = (uint8)ABS<int8>(_sysPalette.colors[colorNr].b - matchBlue);
 			differenceTotal = differenceRed + differenceGreen + differenceBlue;
-			if (differenceTotal < 0) {
-				differenceTotal = differenceTotal;
-			}
 			if (differenceTotal <= bestDifference) {
 				bestDifference = differenceTotal;
 				bestColor = colorNr;






More information about the Scummvm-git-logs mailing list