diff options
| author | Max Horn | 2010-11-17 12:13:03 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-17 12:13:03 +0000 |
| commit | 5a554e3dbe3e9ad3375e43125ec79b07366f4827 (patch) | |
| tree | 2fcddbf6a3d4ee8b5c7191864a48565e8e3528b9 /engines/sci/graphics/palette.cpp | |
| parent | a702ad51234383a4ea3223c17cea6d72253d8fda (diff) | |
| download | scummvm-rg350-5a554e3dbe3e9ad3375e43125ec79b07366f4827.tar.gz scummvm-rg350-5a554e3dbe3e9ad3375e43125ec79b07366f4827.tar.bz2 scummvm-rg350-5a554e3dbe3e9ad3375e43125ec79b07366f4827.zip | |
SCI: Change 'colour' to 'color'
All other instances already were spelled 'color' in the SCI
engine (and also most other parts of ScummVM)
svn-id: r54285
Diffstat (limited to 'engines/sci/graphics/palette.cpp')
| -rw-r--r-- | engines/sci/graphics/palette.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index f5689a956d..a0b1323eb3 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -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(); |