diff options
| author | Filippos Karapetis | 2011-10-19 17:18:44 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2011-10-19 20:29:01 +0300 |
| commit | 722ce77675dcd512a0ba28ab632f51d14b566a94 (patch) | |
| tree | 9b1706b794b9dd592fa01a64fb4f0001d5e8dcde /engines/sci/graphics/palette.cpp | |
| parent | 2dea24a835e54cdb73b6533e256f7a725713b42d (diff) | |
| download | scummvm-rg350-722ce77675dcd512a0ba28ab632f51d14b566a94.tar.gz scummvm-rg350-722ce77675dcd512a0ba28ab632f51d14b566a94.tar.bz2 scummvm-rg350-722ce77675dcd512a0ba28ab632f51d14b566a94.zip | |
SCI: Wrapped some very long lines
Diffstat (limited to 'engines/sci/graphics/palette.cpp')
| -rw-r--r-- | engines/sci/graphics/palette.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index 5f703b90e3..a96d40b948 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -327,7 +327,9 @@ bool GfxPalette::insert(Palette *newPalette, Palette *destPalette) { for (int i = 1; i < 255; i++) { if (newPalette->colors[i].used) { - if ((newPalette->colors[i].r != destPalette->colors[i].r) || (newPalette->colors[i].g != destPalette->colors[i].g) || (newPalette->colors[i].b != destPalette->colors[i].b)) { + if ((newPalette->colors[i].r != destPalette->colors[i].r) || + (newPalette->colors[i].g != destPalette->colors[i].g) || + (newPalette->colors[i].b != destPalette->colors[i].b)) { destPalette->colors[i].r = newPalette->colors[i].r; destPalette->colors[i].g = newPalette->colors[i].g; destPalette->colors[i].b = newPalette->colors[i].b; @@ -354,7 +356,9 @@ bool GfxPalette::merge(Palette *newPalette, bool force, bool forceRealMerge) { // forced palette merging or dest color is not used yet if (force || (!_sysPalette.colors[i].used)) { _sysPalette.colors[i].used = newPalette->colors[i].used; - if ((newPalette->colors[i].r != _sysPalette.colors[i].r) || (newPalette->colors[i].g != _sysPalette.colors[i].g) || (newPalette->colors[i].b != _sysPalette.colors[i].b)) { + if ((newPalette->colors[i].r != _sysPalette.colors[i].r) || + (newPalette->colors[i].g != _sysPalette.colors[i].g) || + (newPalette->colors[i].b != _sysPalette.colors[i].b)) { _sysPalette.colors[i].r = newPalette->colors[i].r; _sysPalette.colors[i].g = newPalette->colors[i].g; _sysPalette.colors[i].b = newPalette->colors[i].b; @@ -367,7 +371,9 @@ bool GfxPalette::merge(Palette *newPalette, bool force, bool forceRealMerge) { // is the same color already at the same position? -> match it directly w/o lookup // this fixes games like lsl1demo/sq5 where the same rgb color exists multiple times and where we would // otherwise match the wrong one (which would result into the pixels affected (or not) by palette changes) - if ((_sysPalette.colors[i].r == newPalette->colors[i].r) && (_sysPalette.colors[i].g == newPalette->colors[i].g) && (_sysPalette.colors[i].b == newPalette->colors[i].b)) { + if ((_sysPalette.colors[i].r == newPalette->colors[i].r) && + (_sysPalette.colors[i].g == newPalette->colors[i].g) && + (_sysPalette.colors[i].b == newPalette->colors[i].b)) { newPalette->mapping[i] = i; continue; } |