libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 22:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Change 'colour' to 'color'

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

svn-id: r54285
This commit is contained in:
Max Horn 2010-11-17 12:13:03 +00:00
parent a702ad5123
commit 5a554e3dbe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/sci/graphics/palette.cpp
View File

@ -192,7 +192,7 @@ void GfxPalette::modifyAmigaPalette(byte *data) {
_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 @@ void GfxPalette::setEGA() {
_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();