[Scummvm-cvs-logs] SF.net SVN: scummvm: [23522] scummvm/trunk/engines/sword2/animation.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Thu Jul 20 22:51:56 CEST 2006


Revision: 23522
          http://svn.sourceforge.net/scummvm/?rev=23522&view=rev
Author:   eriktorbjorn
Date:     2006-07-15 15:22:39 -0700 (Sat, 15 Jul 2006)

Log Message:
-----------
Oops. I just noticed I was using _black to track the white colour, and _white
to track the black colour.

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/animation.cpp

Modified: scummvm/trunk/engines/sword2/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword2/animation.cpp	2006-07-15 22:04:42 UTC (rev 23521)
+++ scummvm/trunk/engines/sword2/animation.cpp	2006-07-15 22:22:39 UTC (rev 23522)
@@ -116,12 +116,12 @@
 		uint32 weight = 3 * r * r + 6 * g * g + 2 * b * b;
 
 		if (weight >= maxWeight) {
-			_black = i;
+			_white = i;
 			maxWeight = weight;
 		}
 
 		if (weight <= minWeight) {
-			_white = i;
+			_black = i;
 			minWeight = i;
 		}
 
@@ -232,9 +232,9 @@
 		for (int y = 0; y < t->textSprite->h; y++) {
 			for (int x = 0; x < t->textSprite->w; x++) {
 				if (src[x] == 1)
+					dst[x] = _black;
+				else if (src[x] == 255)
 					dst[x] = _white;
-				else if (src[x] == 255)
-					dst[x] = _black;
 			}
 			src += t->textSprite->w;
 			dst += screenWidth;






More information about the Scummvm-git-logs mailing list