[Scummvm-cvs-logs] SF.net SVN: scummvm:[51363] scummvm/trunk/engines/sci/graphics/compare.cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Tue Jul 27 13:18:51 CEST 2010
Revision: 51363
http://scummvm.svn.sourceforge.net/scummvm/?rev=51363&view=rev
Author: m_kiewitz
Date: 2010-07-27 11:18:51 +0000 (Tue, 27 Jul 2010)
Log Message:
-----------
SCI: reverting part of r51361
breaks qfg3 right after intro
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/compare.cpp
Modified: scummvm/trunk/engines/sci/graphics/compare.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/compare.cpp 2010-07-27 11:16:44 UTC (rev 51362)
+++ scummvm/trunk/engines/sci/graphics/compare.cpp 2010-07-27 11:18:51 UTC (rev 51363)
@@ -229,19 +229,20 @@
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 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list