aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorColin Snover2016-02-15 15:16:14 -0600
committerColin Snover2016-02-18 13:18:02 -0600
commit37539625d753bba9b8653a68623fb305d29181a6 (patch)
treeb1c2c26b8d6990b4d1dfa53fbf546c7f53814164 /engines/sci
parent75ccabc325d56876dd34d4a55e2034ee66d33d0b (diff)
downloadscummvm-rg350-37539625d753bba9b8653a68623fb305d29181a6.tar.gz
scummvm-rg350-37539625d753bba9b8653a68623fb305d29181a6.tar.bz2
scummvm-rg350-37539625d753bba9b8653a68623fb305d29181a6.zip
SCI: Fix palette equality check
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/helpers.h2
-rw-r--r--engines/sci/graphics/palette32.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/engines/sci/graphics/helpers.h b/engines/sci/graphics/helpers.h
index c48ad4c8bf..e2fdedb27a 100644
--- a/engines/sci/graphics/helpers.h
+++ b/engines/sci/graphics/helpers.h
@@ -227,7 +227,7 @@ struct Palette {
}
}
- return false;
+ return true;
}
inline bool operator!=(const Palette &other) const {
return !(*this == other);
diff --git a/engines/sci/graphics/palette32.cpp b/engines/sci/graphics/palette32.cpp
index 40e4021e72..a164dde1ee 100644
--- a/engines/sci/graphics/palette32.cpp
+++ b/engines/sci/graphics/palette32.cpp
@@ -228,8 +228,6 @@ void GfxPalette32::updateFFrame() {
void GfxPalette32::updateHardware() {
if (_sysPalette == _nextPalette) {
- // TODO: This condition has never been encountered yet
- debug("Skipping hardware update because palettes are identical");
return;
}