From d013be51e535ff05b2f3f54c448b50b655bceaf3 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 27 Jul 2010 11:18:51 +0000
Subject: SCI: reverting part of r51361

breaks qfg3 right after intro

svn-id: r51363
---
 engines/sci/graphics/compare.cpp | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp
index 9eda688a64..0a186115d0 100644
--- a/engines/sci/graphics/compare.cpp
+++ b/engines/sci/graphics/compare.cpp
@@ -229,19 +229,20 @@ void GfxCompare::kernelBaseSetter(reg_t object) {
 		if (viewId == 0xFFFF)	// invalid view
 			return;
 
-		uint16 scaleSignal = 0;
-		if (getSciVersion() >= SCI_VERSION_1_1) {
-			scaleSignal = readSelectorValue(_segMan, object, SELECTOR(scaleSignal)) & kScaleSignalDoScaling;
-			if (scaleSignal) {
-				int16 scaleY = readSelectorValue(_segMan, object, SELECTOR(scaleY));
-				if (scaleY < 64)
-					scaleSignal = 0;
-			}
-		}
+		// must be something wrong with this TODO check - currently it breaks qfg3 right after the intro
+		//uint16 scaleSignal = 0;
+		//if (getSciVersion() >= SCI_VERSION_1_1) {
+		//	scaleSignal = readSelectorValue(_segMan, object, SELECTOR(scaleSignal)) & kScaleSignalDoScaling;
+		//	if (scaleSignal) {
+		//		int16 scaleY = readSelectorValue(_segMan, object, SELECTOR(scaleY));
+		//		if (scaleY < 64)
+		//			scaleSignal = 0;
+		//	}
+		//}
 
 		Common::Rect celRect;
 
-		if (!scaleSignal) {
+		//if (!scaleSignal) {
 			GfxView *tmpView = _cache->getView(viewId);
 			if (tmpView->isSci2Hires())
 				_screen->adjustToUpscaledCoordinates(y, x);
@@ -255,12 +256,12 @@ void GfxCompare::kernelBaseSetter(reg_t object) {
 
 			celRect.bottom = y + 1;
 			celRect.top = celRect.bottom - yStep;
-		} else {
-			celRect.left = readSelectorValue(_segMan, object, SELECTOR(nsLeft));
-			celRect.right = readSelectorValue(_segMan, object, SELECTOR(nsRight));
-			celRect.top = readSelectorValue(_segMan, object, SELECTOR(nsTop));
-			celRect.bottom = readSelectorValue(_segMan, object, SELECTOR(nsBottom));
-		}
+		//} else {
+		//	celRect.left = readSelectorValue(_segMan, object, SELECTOR(nsLeft));
+		//	celRect.right = readSelectorValue(_segMan, object, SELECTOR(nsRight));
+		//	celRect.top = readSelectorValue(_segMan, object, SELECTOR(nsTop));
+		//	celRect.bottom = readSelectorValue(_segMan, object, SELECTOR(nsBottom));
+		//}
 
 		writeSelectorValue(_segMan, object, SELECTOR(brLeft), celRect.left);
 		writeSelectorValue(_segMan, object, SELECTOR(brRight), celRect.right);
-- 
cgit v1.2.3