aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2016-03-07 22:51:37 -0600
committerColin Snover2016-03-07 22:52:49 -0600
commit0235a84b905a79677fb0c95c7277c0fa3c89bb23 (patch)
treedfd39671896b7f7d69870caa7cd3064ab54687ac
parentb9fa04c201e4aaf23c77aa9683a60989e589453a (diff)
downloadscummvm-rg350-0235a84b905a79677fb0c95c7277c0fa3c89bb23.tar.gz
scummvm-rg350-0235a84b905a79677fb0c95c7277c0fa3c89bb23.tar.bz2
scummvm-rg350-0235a84b905a79677fb0c95c7277c0fa3c89bb23.zip
SCI32: Enable GfxPalette32::cycleAllPause
This is used by the Mr Soylent machines in SQ6 (e.g. room 370).
-rw-r--r--engines/sci/graphics/palette32.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/sci/graphics/palette32.cpp b/engines/sci/graphics/palette32.cpp
index 9204e4bf96..9b52e85b26 100644
--- a/engines/sci/graphics/palette32.cpp
+++ b/engines/sci/graphics/palette32.cpp
@@ -695,14 +695,8 @@ void GfxPalette32::cycleAllOn() {
}
void GfxPalette32::cycleAllPause() {
- // TODO: The SCI SQ6 cycleAllPause function does not seem to perform
- // nullptr checking?? This would definitely cause null pointer
- // dereference in SCI code. I have not seen anything actually call
- // this function yet, so it is possible it is just unused and broken
- // in SCI SQ6. This assert exists so that if this function is called,
- // it is noticed and can be rechecked in the actual engine.
- // Obviously this code *does* do nullptr checks instead of crashing. :)
- assert(0);
+ // NOTE: The original engine did not check for null pointers in the
+ // palette cyclers pointer array.
for (int i = 0, len = ARRAYSIZE(_cyclers); i < len; ++i) {
PalCycler *cycler = _cyclers[i];
if (cycler != nullptr) {