diff options
| author | Colin Snover | 2016-11-27 10:53:06 -0600 |
|---|---|---|
| committer | Colin Snover | 2016-12-19 14:46:59 -0600 |
| commit | 4cff1e400f7e1e885b12990a5a34772d05eb2285 (patch) | |
| tree | a9e85d62fa6fd48bd2cc19d0d6a55d855fc5a6f4 /engines/sci/graphics/screen_item32.cpp | |
| parent | 5220ce1e4f9090d0e6272d680dbfa3813233399b (diff) | |
| download | scummvm-rg350-4cff1e400f7e1e885b12990a5a34772d05eb2285.tar.gz scummvm-rg350-4cff1e400f7e1e885b12990a5a34772d05eb2285.tar.bz2 scummvm-rg350-4cff1e400f7e1e885b12990a5a34772d05eb2285.zip | |
SCI32: Add support for alternate graphics selectors
Used by at least Phantasmagoria 2.
Diffstat (limited to 'engines/sci/graphics/screen_item32.cpp')
| -rw-r--r-- | engines/sci/graphics/screen_item32.cpp | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp index a70f25fd6b..3c12a673a7 100644 --- a/engines/sci/graphics/screen_item32.cpp +++ b/engines/sci/graphics/screen_item32.cpp @@ -22,6 +22,7 @@ #include "sci/console.h" #include "sci/resource.h" +#include "sci/engine/features.h" #include "sci/engine/kernel.h" #include "sci/engine/selector.h" #include "sci/engine/state.h" @@ -238,14 +239,26 @@ void ScreenItem::setFromObject(SegManager *segMan, const reg_t object, const boo _z = readSelectorValue(segMan, object, SELECTOR(z)); _position.y -= _z; - if (readSelectorValue(segMan, object, SELECTOR(useInsetRect))) { - _useInsetRect = true; - _insetRect.left = readSelectorValue(segMan, object, SELECTOR(inLeft)); - _insetRect.top = readSelectorValue(segMan, object, SELECTOR(inTop)); - _insetRect.right = readSelectorValue(segMan, object, SELECTOR(inRight)) + 1; - _insetRect.bottom = readSelectorValue(segMan, object, SELECTOR(inBottom)) + 1; + if (g_sci->_features->usesAlternateSelectors()) { + if (readSelectorValue(segMan, object, SELECTOR(seenRect))) { + _useInsetRect = true; + _insetRect.left = readSelectorValue(segMan, object, SELECTOR(left)); + _insetRect.top = readSelectorValue(segMan, object, SELECTOR(top)); + _insetRect.right = readSelectorValue(segMan, object, SELECTOR(right)) + 1; + _insetRect.bottom = readSelectorValue(segMan, object, SELECTOR(bottom)) + 1; + } else { + _useInsetRect = false; + } } else { - _useInsetRect = false; + if (readSelectorValue(segMan, object, SELECTOR(useInsetRect))) { + _useInsetRect = true; + _insetRect.left = readSelectorValue(segMan, object, SELECTOR(inLeft)); + _insetRect.top = readSelectorValue(segMan, object, SELECTOR(inTop)); + _insetRect.right = readSelectorValue(segMan, object, SELECTOR(inRight)) + 1; + _insetRect.bottom = readSelectorValue(segMan, object, SELECTOR(inBottom)) + 1; + } else { + _useInsetRect = false; + } } segMan->getObject(object)->clearInfoSelectorFlag(kInfoFlagViewVisible); |