diff options
| author | Martin Kiewitz | 2010-01-29 16:26:40 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-29 16:26:40 +0000 |
| commit | 266ff9934d223439a53175b4acb1f4acbb11a747 (patch) | |
| tree | 25d26946f6a748e10985f96e79500a06d8a6252c | |
| parent | 233f81c5e1946a49da240a44b510a8b0710f4aad (diff) | |
| download | scummvm-rg350-266ff9934d223439a53175b4acb1f4acbb11a747.tar.gz scummvm-rg350-266ff9934d223439a53175b4acb1f4acbb11a747.tar.bz2 scummvm-rg350-266ff9934d223439a53175b4acb1f4acbb11a747.zip | |
SCI: removing bit 1 support (was introduced because of problems in sci1.1 games, isnt valid anymore), fixes kq5cd
svn-id: r47674
| -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 e6169ffb2f..f18d51fd70 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -227,8 +227,8 @@ void SciPalette::merge(Palette *pFrom, Palette *pTo, bool force, bool forceRealM for (i = 1 ; i < 255; i++) { if (!pFrom->colors[i].used)// color is not used - so skip it continue; - // forced palette merging or dest color is not used yet or bit 1 of new color is set - if (force || (!pTo->colors[i].used) || (pFrom->colors[i].used & 2)) { + // forced palette merging or dest color is not used yet + if (force || (!pTo->colors[i].used)) { pTo->colors[i].used = pFrom->colors[i].used; pTo->colors[i].r = pFrom->colors[i].r; pTo->colors[i].g = pFrom->colors[i].g; |