diff options
| author | Willem Jan Palenstijn | 2010-11-04 19:45:38 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2010-11-04 19:45:38 +0000 |
| commit | 51f7c4c52520d888d54bfe3be6ef2a7288d0888d (patch) | |
| tree | 601bbe1434c4f11e1e4c87d40564a8b5832b7e04 | |
| parent | 5bab2d570bc94c743380a33f892df3bac0006880 (diff) | |
| download | scummvm-rg350-51f7c4c52520d888d54bfe3be6ef2a7288d0888d.tar.gz scummvm-rg350-51f7c4c52520d888d54bfe3be6ef2a7288d0888d.tar.bz2 scummvm-rg350-51f7c4c52520d888d54bfe3be6ef2a7288d0888d.zip | |
SCI: Fix precedence error in comment
svn-id: r54071
| -rw-r--r-- | engines/sci/graphics/palette.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index 96646237ee..876d263440 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -193,8 +193,8 @@ void GfxPalette::modifyAmigaPalette(byte *data) { } static byte blendColours(byte c1, byte c2) { - // linear: - // return (c1/2+c2/2)+(c1&1+c2&1)/2; + // linear + // return (c1/2+c2/2)+((c1&1)+(c2&1))/2; // gamma 2.2 double t = 0.5 + (pow (c1/255.0, 2.2/1.0) * 255.0) + |