diff options
Diffstat (limited to 'engines/scumm/he')
| -rw-r--r-- | engines/scumm/he/animation_he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/floodfill_he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/script_v100he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/script_v72he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/sprite_he.cpp | 10 | ||||
| -rw-r--r-- | engines/scumm/he/wiz_he.cpp | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 23d1231e97..76184633e1 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -93,7 +93,7 @@ void MoviePlayer::handleNextFrame() { copyFrameToBuffer(pvs->getBackPixels(0, 0), 0, 0, _vm->_screenWidth); Common::Rect imageRect(_width, _height); - _vm->gdi.copyVirtScreenBuffers(imageRect); + _vm->_gdi->copyVirtScreenBuffers(imageRect); } else { copyFrameToBuffer(pvs->getPixels(0, 0), 0, 0, _vm->_screenWidth); diff --git a/engines/scumm/he/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp index 5a1ede852a..f4a3cc7998 100644 --- a/engines/scumm/he/floodfill_he.cpp +++ b/engines/scumm/he/floodfill_he.cpp @@ -220,7 +220,7 @@ void floodFill(FloodFillParameters *ffp, ScummEngine_v90he *vm) { if (r.left <= r.right && r.top <= r.bottom) { if (ffp->flags & 0x8000) { - vm->gdi.copyVirtScreenBuffers(r); + vm->_gdi->copyVirtScreenBuffers(r); } else { ++r.bottom; vm->markRectAsDirty(kMainVirtScreen, r); diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index 6d4b84883d..6efa7d612a 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -2151,7 +2151,7 @@ void ScummEngine_v100he::o100_systemOps() { debug(0, "Start executable (%s)", string); break; case 75: - gdi.copyVirtScreenBuffers(Common::Rect(_screenWidth, _screenHeight)); + _gdi->copyVirtScreenBuffers(Common::Rect(_screenWidth, _screenHeight)); updatePalette(); break; default: diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index e4bfad4b0d..dfc8b89151 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -1528,7 +1528,7 @@ void ScummEngine_v72he::o72_systemOps() { clearDrawObjectQueue(); break; case 26: // HE80+ - gdi.copyVirtScreenBuffers(Common::Rect(_screenWidth, _screenHeight)); + _gdi->copyVirtScreenBuffers(Common::Rect(_screenWidth, _screenHeight)); updatePalette(); break; case 158: diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp index a86305d2b9..40b05e2f68 100644 --- a/engines/scumm/he/sprite_he.cpp +++ b/engines/scumm/he/sprite_he.cpp @@ -1066,7 +1066,7 @@ void Sprite::resetTables(bool refreshScreen) { resetGroup(curGrp); if (refreshScreen) { - _vm->gdi.copyVirtScreenBuffers(Common::Rect(_vm->_screenWidth, _vm->_screenHeight)); + _vm->_gdi->copyVirtScreenBuffers(Common::Rect(_vm->_screenWidth, _vm->_screenHeight)); } _numSpritesToProcess = 0; } @@ -1084,7 +1084,7 @@ void Sprite::resetBackground() { spi->flags &= ~kSFChanged; if (spi->bbox.left <= spi->bbox.right && spi->bbox.top <= spi->bbox.bottom) { if (spi->flags & kSFBlitDirectly) { - _vm->gdi.copyVirtScreenBuffers(spi->bbox, USAGE_BIT_RESTORED); + _vm->_gdi->copyVirtScreenBuffers(spi->bbox, USAGE_BIT_RESTORED); } else if (firstLoop) { xmin = spi->bbox.left; ymin = spi->bbox.top; @@ -1113,7 +1113,7 @@ void Sprite::resetBackground() { } } if (refreshScreen) { - _vm->gdi.copyVirtScreenBuffers(Common::Rect(xmin, ymin, xmax, ymax), USAGE_BIT_RESTORED); + _vm->_gdi->copyVirtScreenBuffers(Common::Rect(xmin, ymin, xmax, ymax), USAGE_BIT_RESTORED); } } @@ -1125,10 +1125,10 @@ void Sprite::setRedrawFlags(bool checkZOrder) { if ((!checkZOrder || spi->priority >= 0) && (spi->flags & kSFMarkDirty)) { int32 lp = spi->bbox.left / 8; lp = MAX((int32)0, lp); - lp = MIN(lp, _vm->gdi._numStrips); + lp = MIN(lp, _vm->_gdi->_numStrips); int32 rp = (spi->bbox.right + 7) / 8; rp = MAX((int32)0, rp); - rp = MIN(rp, _vm->gdi._numStrips); + rp = MIN(rp, _vm->_gdi->_numStrips); for (; lp < rp; lp++) { if (vs->tdirty[lp] < vs->h && spi->bbox.bottom >= vs->tdirty[lp] && spi->bbox.top <= vs->bdirty[lp]) { spi->flags |= kSFNeedRedraw; diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index 74414fc2cc..f2c60223d8 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -1226,7 +1226,7 @@ uint8 *Wiz::drawWizImage(int resNum, int state, int x1, int y1, int zorder, int ++rImage.bottom; _vm->markRectAsDirty(kMainVirtScreen, rImage); } else { - _vm->gdi.copyVirtScreenBuffers(rImage); + _vm->_gdi->copyVirtScreenBuffers(rImage); } } } @@ -1485,7 +1485,7 @@ void Wiz::drawWizPolygonTransform(int resNum, int state, Common::Point *wp, int if (flags & kWIFMarkBufferDirty) { _vm->markRectAsDirty(kMainVirtScreen, bound); } else { - _vm->gdi.copyVirtScreenBuffers(bound); + _vm->_gdi->copyVirtScreenBuffers(bound); } free(srcWizBuf); |