[Scummvm-cvs-logs] scummvm master -> 0235a84b905a79677fb0c95c7277c0fa3c89bb23

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0235a84b90 SCI32: Enable GfxPalette32::cycleAllPause


Commit: 0235a84b905a79677fb0c95c7277c0fa3c89bb23
    https://github.com/scummvm/scummvm/commit/0235a84b905a79677fb0c95c7277c0fa3c89bb23
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-07T22:52:49-06:00

Commit Message:
SCI32: Enable GfxPalette32::cycleAllPause

This is used by the Mr Soylent machines in SQ6 (e.g. room 370).

Changed paths:
    engines/sci/graphics/palette32.cpp



diff --git a/engines/sci/graphics/palette32.cpp b/engines/sci/graphics/palette32.cpp
index 9204e4b..9b52e85 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) {