[Scummvm-cvs-logs] SF.net SVN: scummvm:[54285] scummvm/trunk/engines/sci/graphics/palette.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Wed Nov 17 13:13:04 CET 2010


Revision: 54285
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54285&view=rev
Author:   fingolfin
Date:     2010-11-17 12:13:03 +0000 (Wed, 17 Nov 2010)

Log Message:
-----------
SCI: Change 'colour' to 'color'

All other instances already were spelled 'color' in the SCI
engine (and also most other parts of ScummVM)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/palette.cpp

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-11-17 11:17:38 UTC (rev 54284)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-11-17 12:13:03 UTC (rev 54285)
@@ -192,7 +192,7 @@
 	_screen->setPalette(&_sysPalette);
 }
 
-static byte blendColours(byte c1, byte c2) {
+static byte blendColors(byte c1, byte c2) {
 	// linear
 	// return (c1/2+c2/2)+((c1&1)+(c2&1))/2;
 
@@ -230,9 +230,9 @@
 		_sysPalette.colors[curColor].used = 1;
 		color1 = curColor & 0x0F; color2 = curColor >> 4;
 
-		_sysPalette.colors[curColor].r = blendColours(_sysPalette.colors[color1].r, _sysPalette.colors[color2].r);
-		_sysPalette.colors[curColor].g = blendColours(_sysPalette.colors[color1].g, _sysPalette.colors[color2].g);
-		_sysPalette.colors[curColor].b = blendColours(_sysPalette.colors[color1].b, _sysPalette.colors[color2].b);
+		_sysPalette.colors[curColor].r = blendColors(_sysPalette.colors[color1].r, _sysPalette.colors[color2].r);
+		_sysPalette.colors[curColor].g = blendColors(_sysPalette.colors[color1].g, _sysPalette.colors[color2].g);
+		_sysPalette.colors[curColor].b = blendColors(_sysPalette.colors[color1].b, _sysPalette.colors[color2].b);
 	}
 	_sysPalette.timestamp = 1;
 	setOnScreen();


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