diff options
| author | Martin Kiewitz | 2010-05-15 08:57:13 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-05-15 08:57:13 +0000 |
| commit | 59a255226f95d395cb73119ae2e04a3494d404a5 (patch) | |
| tree | 77d5beec3ab725b41c8398c133ca93215085a743 /engines/sci/graphics/compare.cpp | |
| parent | 83a25d2e37ad1cc0870e195bc468a67dba4c353a (diff) | |
| download | scummvm-rg350-59a255226f95d395cb73119ae2e04a3494d404a5.tar.gz scummvm-rg350-59a255226f95d395cb73119ae2e04a3494d404a5.tar.bz2 scummvm-rg350-59a255226f95d395cb73119ae2e04a3494d404a5.zip | |
SCI: SCI_SCREEN_MASK_* now GFX_SCREEN_MASK_*, using enum - added new enum GFX_SCREEN_UPSCALED_*
svn-id: r49039
Diffstat (limited to 'engines/sci/graphics/compare.cpp')
| -rw-r--r-- | engines/sci/graphics/compare.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp index d046c74d60..36dd2d4aed 100644 --- a/engines/sci/graphics/compare.cpp +++ b/engines/sci/graphics/compare.cpp @@ -53,7 +53,7 @@ uint16 GfxCompare::isOnControl(uint16 screenMask, const Common::Rect &rect) { if (rect.isEmpty()) return 0; - if (screenMask & SCI_SCREEN_MASK_PRIORITY) { + if (screenMask & GFX_SCREEN_MASK_PRIORITY) { for (y = rect.top; y < rect.bottom; y++) { for (x = rect.left; x < rect.right; x++) { result |= 1 << _screen->getPriority(x, y); @@ -161,7 +161,7 @@ bool GfxCompare::kernelCanBeHere(reg_t curObject, reg_t listReference) { signal = GET_SEL32V(_segMan, curObject, SELECTOR(signal)); controlMask = GET_SEL32V(_segMan, curObject, SELECTOR(illegalBits)); - result = (isOnControl(SCI_SCREEN_MASK_CONTROL, adjustedRect) & controlMask) ? false : true; + result = (isOnControl(GFX_SCREEN_MASK_CONTROL, adjustedRect) & controlMask) ? false : true; if ((result) && (signal & (kSignalIgnoreActor | kSignalRemoveView)) == 0) { List *list = _segMan->lookupList(listReference); if (!list) |