diff options
| author | Martin Kiewitz | 2010-07-27 11:18:51 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-07-27 11:18:51 +0000 |
| commit | d013be51e535ff05b2f3f54c448b50b655bceaf3 (patch) | |
| tree | 1a93b7aa39b033821d1092ee4cf1dbf2abe2f569 /engines/sci/graphics/compare.cpp | |
| parent | d508ba67663c3150d2c7052cf568234e8739bdfb (diff) | |
| download | scummvm-rg350-d013be51e535ff05b2f3f54c448b50b655bceaf3.tar.gz scummvm-rg350-d013be51e535ff05b2f3f54c448b50b655bceaf3.tar.bz2 scummvm-rg350-d013be51e535ff05b2f3f54c448b50b655bceaf3.zip | |
SCI: reverting part of r51361
breaks qfg3 right after intro
svn-id: r51363
Diffstat (limited to 'engines/sci/graphics/compare.cpp')
| -rw-r--r-- | engines/sci/graphics/compare.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
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); |