diff options
Diffstat (limited to 'engines/sci/graphics/frameout.cpp')
| -rw-r--r-- | engines/sci/graphics/frameout.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index 3cc5ca5447..78253bd913 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -54,7 +54,7 @@ GfxFrameout::~GfxFrameout() { void GfxFrameout::kernelAddPlane(reg_t object) { _planes.push_back(object); - int16 planePri = readSelectorValue(_segMan, object, SELECTOR(priority)) & 0xFFFF; + int16 planePri = GET_SEL32V(_segMan, object, SELECTOR(priority)) & 0xFFFF; if (planePri > _highPlanePri) _highPlanePri = planePri; } @@ -74,7 +74,7 @@ void GfxFrameout::kernelDeletePlane(reg_t object) { _highPlanePri = 0; for (uint32 planeNr = 0; planeNr < _planes.size(); planeNr++) { - int16 planePri = readSelectorValue(_segMan, _planes[planeNr], SELECTOR(priority)) & 0xFFFF; + int16 planePri = GET_SEL32V(_segMan, _planes[planeNr], SELECTOR(priority)) & 0xFFFF; if (planePri > _highPlanePri) _highPlanePri = planePri; } @@ -126,29 +126,29 @@ void GfxFrameout::kernelFrameout() { for (uint32 planeNr = 0; planeNr < _planes.size(); planeNr++) { planeObject = _planes[planeNr]; - planePriority = readSelectorValue(_segMan, planeObject, SELECTOR(priority)); + planePriority = GET_SEL32V(_segMan, planeObject, SELECTOR(priority)); if (planePriority == -1) // Plane currently not meant to be shown continue; - planeRect.top = readSelectorValue(_segMan, planeObject, SELECTOR(top)); - planeRect.left = readSelectorValue(_segMan, planeObject, SELECTOR(left)); - planeRect.bottom = readSelectorValue(_segMan, planeObject, SELECTOR(bottom)); - planeRect.right = readSelectorValue(_segMan, planeObject, SELECTOR(right)); - planeResY = readSelectorValue(_segMan, planeObject, SELECTOR(resY)); - planeResX = readSelectorValue(_segMan, planeObject, SELECTOR(resX)); + planeRect.top = GET_SEL32V(_segMan, planeObject, SELECTOR(top)); + planeRect.left = GET_SEL32V(_segMan, planeObject, SELECTOR(left)); + planeRect.bottom = GET_SEL32V(_segMan, planeObject, SELECTOR(bottom)); + planeRect.right = GET_SEL32V(_segMan, planeObject, SELECTOR(right)); + planeResY = GET_SEL32V(_segMan, planeObject, SELECTOR(resY)); + planeResX = GET_SEL32V(_segMan, planeObject, SELECTOR(resX)); planeRect.top = (planeRect.top * _screen->getHeight()) / planeResY; planeRect.left = (planeRect.left * _screen->getWidth()) / planeResX; planeRect.bottom = (planeRect.bottom * _screen->getHeight()) / planeResY; planeRect.right = (planeRect.right * _screen->getWidth()) / planeResX; - planeBack = readSelectorValue(_segMan, planeObject, SELECTOR(back)); + planeBack = GET_SEL32V(_segMan, planeObject, SELECTOR(back)); if (planeBack) { _paint32->fillRect(planeRect, planeBack); } - planePictureNr = readSelectorValue(_segMan, planeObject, SELECTOR(picture)); + planePictureNr = GET_SEL32V(_segMan, planeObject, SELECTOR(picture)); if ((planePictureNr != 0xFFFF) && (planePictureNr != 0xFFFE)) { planePicture = new GfxPicture(_resMan, _coordAdjuster, 0, _screen, _palette, planePictureNr, false); planePictureCels = planePicture->getSci32celCount(); @@ -161,19 +161,19 @@ void GfxFrameout::kernelFrameout() { itemEntry = itemData; for (uint32 itemNr = 0; itemNr < _screenItems.size(); itemNr++) { itemObject = _screenItems[itemNr]; - itemPlane = readSelector(_segMan, itemObject, SELECTOR(plane)); + itemPlane = GET_SEL32(_segMan, itemObject, SELECTOR(plane)); if (planeObject == itemPlane) { // Found an item on current plane - itemEntry->viewId = readSelectorValue(_segMan, itemObject, SELECTOR(view)); - itemEntry->loopNo = readSelectorValue(_segMan, itemObject, SELECTOR(loop)); - itemEntry->celNo = readSelectorValue(_segMan, itemObject, SELECTOR(cel)); - itemEntry->x = readSelectorValue(_segMan, itemObject, SELECTOR(x)); - itemEntry->y = readSelectorValue(_segMan, itemObject, SELECTOR(y)); - itemEntry->z = readSelectorValue(_segMan, itemObject, SELECTOR(z)); - itemEntry->priority = readSelectorValue(_segMan, itemObject, SELECTOR(priority)); - itemEntry->signal = readSelectorValue(_segMan, itemObject, SELECTOR(signal)); - itemEntry->scaleX = readSelectorValue(_segMan, itemObject, SELECTOR(scaleX)); - itemEntry->scaleY = readSelectorValue(_segMan, itemObject, SELECTOR(scaleY)); + itemEntry->viewId = GET_SEL32V(_segMan, itemObject, SELECTOR(view)); + itemEntry->loopNo = GET_SEL32V(_segMan, itemObject, SELECTOR(loop)); + itemEntry->celNo = GET_SEL32V(_segMan, itemObject, SELECTOR(cel)); + itemEntry->x = GET_SEL32V(_segMan, itemObject, SELECTOR(x)); + itemEntry->y = GET_SEL32V(_segMan, itemObject, SELECTOR(y)); + itemEntry->z = GET_SEL32V(_segMan, itemObject, SELECTOR(z)); + itemEntry->priority = GET_SEL32V(_segMan, itemObject, SELECTOR(priority)); + itemEntry->signal = GET_SEL32V(_segMan, itemObject, SELECTOR(signal)); + itemEntry->scaleX = GET_SEL32V(_segMan, itemObject, SELECTOR(scaleX)); + itemEntry->scaleY = GET_SEL32V(_segMan, itemObject, SELECTOR(scaleY)); itemEntry->object = itemObject; itemEntry->y = ((itemEntry->y * _screen->getHeight()) / planeResY); @@ -240,12 +240,12 @@ void GfxFrameout::kernelFrameout() { // This doesn't work for SCI2.1 games... if (getSciVersion() == SCI_VERSION_2) { Kernel *kernel = g_sci->getKernel(); - if (lookupSelector(_segMan, itemEntry->object, kernel->_selectorCache.text, NULL, NULL) == kSelectorVariable) { - Common::String text = _segMan->getString(readSelector(_segMan, itemEntry->object, SELECTOR(text))); - int16 fontRes = readSelectorValue(_segMan, itemEntry->object, SELECTOR(font)); + if (lookup_selector(_segMan, itemEntry->object, kernel->_selectorCache.text, NULL, NULL) == kSelectorVariable) { + Common::String text = _segMan->getString(GET_SEL32(_segMan, itemEntry->object, SELECTOR(text))); + int16 fontRes = GET_SEL32V(_segMan, itemEntry->object, SELECTOR(font)); GfxFont *font = new GfxFontFromResource(_resMan, _screen, fontRes); - bool dimmed = readSelectorValue(_segMan, itemEntry->object, SELECTOR(dimmed)); - uint16 foreColor = readSelectorValue(_segMan, itemEntry->object, SELECTOR(fore)); + bool dimmed = GET_SEL32V(_segMan, itemEntry->object, SELECTOR(dimmed)); + uint16 foreColor = GET_SEL32V(_segMan, itemEntry->object, SELECTOR(fore)); uint16 curX = itemEntry->x; uint16 curY = itemEntry->y; for (uint32 i = 0; i < text.size(); i++) { |