[Scummvm-cvs-logs] scummvm master -> 138c19f06f2830a4c5b549de4852597529a2c121

[bluegr]

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:
138c19f06f SCI32: Remove two hacks for Torin, and document what happens instead


Commit: 138c19f06f2830a4c5b549de4852597529a2c121
    https://github.com/scummvm/scummvm/commit/138c19f06f2830a4c5b549de4852597529a2c121
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-02-27T15:00:55+02:00

Commit Message:
SCI32: Remove two hacks for Torin, and document what happens instead

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



diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp
index 716a366..8333459 100644
--- a/engines/sci/graphics/compare.cpp
+++ b/engines/sci/graphics/compare.cpp
@@ -111,12 +111,10 @@ uint16 GfxCompare::kernelOnControl(byte screenMask, const Common::Rect &rect) {
 void GfxCompare::kernelSetNowSeen(reg_t objectReference) {
 	GfxView *view = NULL;
 	Common::Rect celRect(0, 0);
+	// TODO/FIXME: Torin's menu code tries to draw special views with an ID of 0xFFFF, which
+	// are not currently handled properly and cause a crash. These might be text views that
+	// are not properly implemented.
 	GuiResourceId viewId = (GuiResourceId)readSelectorValue(_segMan, objectReference, SELECTOR(view));
-
-	// HACK: Ignore invalid views for now (perhaps unimplemented text views?)
-	if (viewId == 0xFFFF)	// invalid view
-		return;
-
 	int16 loopNo = readSelectorValue(_segMan, objectReference, SELECTOR(loop));
 	int16 celNo = readSelectorValue(_segMan, objectReference, SELECTOR(cel));
 	int16 x = (int16)readSelectorValue(_segMan, objectReference, SELECTOR(x));
@@ -201,15 +199,9 @@ void GfxCompare::kernelBaseSetter(reg_t object) {
 		GuiResourceId viewId = readSelectorValue(_segMan, object, SELECTOR(view));
 		int16 loopNo = readSelectorValue(_segMan, object, SELECTOR(loop));
 		int16 celNo = readSelectorValue(_segMan, object, SELECTOR(cel));
-
-		// HACK: Ignore invalid views for now (perhaps unimplemented text views?)
-		if (viewId == 0xFFFF)	// invalid view
-			return;
-
 		uint16 scaleSignal = 0;
-		if (getSciVersion() >= SCI_VERSION_1_1) {
+		if (getSciVersion() >= SCI_VERSION_1_1)
 			scaleSignal = readSelectorValue(_segMan, object, SELECTOR(scaleSignal));
-		}
 
 		Common::Rect celRect;