diff options
| author | Filippos Karapetis | 2010-06-10 09:18:57 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-10 09:18:57 +0000 |
| commit | eb4ec596cdb8e541d5221263b3db185bd01b206f (patch) | |
| tree | 83d0f31aaa8a3a5314ae3bc0ec9433818f4552ef /engines/sci/graphics/compare.cpp | |
| parent | 0ab7c908bb3971a74bb1c8848d6f59f161464ad1 (diff) | |
| download | scummvm-rg350-eb4ec596cdb8e541d5221263b3db185bd01b206f.tar.gz scummvm-rg350-eb4ec596cdb8e541d5221263b3db185bd01b206f.tar.bz2 scummvm-rg350-eb4ec596cdb8e541d5221263b3db185bd01b206f.zip | |
Use the SELECTOR() macro for readability
svn-id: r49563
Diffstat (limited to 'engines/sci/graphics/compare.cpp')
| -rw-r--r-- | engines/sci/graphics/compare.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp index 3102edc2fa..47b4f22607 100644 --- a/engines/sci/graphics/compare.cpp +++ b/engines/sci/graphics/compare.cpp @@ -126,14 +126,14 @@ void GfxCompare::kernelSetNowSeen(reg_t objectReference) { int16 x = (int16)readSelectorValue(_segMan, objectReference, SELECTOR(x)); int16 y = (int16)readSelectorValue(_segMan, objectReference, SELECTOR(y)); int16 z = 0; - if (_kernel->_selectorCache.z > -1) + if (SELECTOR(z) > -1) z = (int16)readSelectorValue(_segMan, objectReference, SELECTOR(z)); // now get cel rectangle view = _cache->getView(viewId); view->getCelRect(loopNo, celNo, x, y, z, &celRect); - if (lookupSelector(_segMan, objectReference, _kernel->_selectorCache.nsTop, NULL, NULL) == kSelectorVariable) { + if (lookupSelector(_segMan, objectReference, SELECTOR(nsTop), NULL, NULL) == kSelectorVariable) { writeSelectorValue(_segMan, objectReference, SELECTOR(nsLeft), celRect.left); writeSelectorValue(_segMan, objectReference, SELECTOR(nsRight), celRect.right); writeSelectorValue(_segMan, objectReference, SELECTOR(nsTop), celRect.top); @@ -183,10 +183,10 @@ bool GfxCompare::kernelIsItSkip(GuiResourceId viewId, int16 loopNo, int16 celNo, } void GfxCompare::kernelBaseSetter(reg_t object) { - if (lookupSelector(_segMan, object, _kernel->_selectorCache.brLeft, NULL, NULL) == kSelectorVariable) { + if (lookupSelector(_segMan, object, SELECTOR(brLeft), NULL, NULL) == kSelectorVariable) { int16 x = readSelectorValue(_segMan, object, SELECTOR(x)); int16 y = readSelectorValue(_segMan, object, SELECTOR(y)); - int16 z = (_kernel->_selectorCache.z > -1) ? readSelectorValue(_segMan, object, SELECTOR(z)) : 0; + int16 z = (SELECTOR(z) > -1) ? readSelectorValue(_segMan, object, SELECTOR(z)) : 0; int16 yStep = readSelectorValue(_segMan, object, SELECTOR(yStep)); GuiResourceId viewId = readSelectorValue(_segMan, object, SELECTOR(view)); int16 loopNo = readSelectorValue(_segMan, object, SELECTOR(loop)); |