diff options
Diffstat (limited to 'engines/mads/screen.cpp')
| -rw-r--r-- | engines/mads/screen.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index 05f9de61e2..79d5256c1c 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -201,7 +201,7 @@ void DirtyAreas::mergeAreas(int idx1, int idx2) { da1._textActive = true; } -void DirtyAreas::copy(MSurface *srcSurface, MSurface *destSurface, const Common::Point &posAdjust) { +void DirtyAreas::copy(BaseSurface *srcSurface, BaseSurface *destSurface, const Common::Point &posAdjust) { for (uint i = 0; i < size(); ++i) { const Common::Rect &srcBounds = (*this)[i]._bounds; @@ -555,7 +555,7 @@ void ScreenObjects::synchronize(Common::Serializer &s) { /*------------------------------------------------------------------------*/ -Screen::Screen(): Graphics::Screen(), MSurface() { +Screen::Screen(): BaseSurface() { // Create the screen surface separately on another surface, since the screen // surface will be subject to change as the clipping area is altered _rawSurface.create(MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT); @@ -671,7 +671,7 @@ void Screen::transition(ScreenTransition transitionType, bool surfaceFlag) { void Screen::panTransition(MSurface &newScreen, byte *palData, int entrySide, const Common::Point &srcPos, const Common::Point &destPos, - ThroughBlack throughBlack, bool setPalette, int numTicks) { + ThroughBlack throughBlack, bool setPalette_, int numTicks) { EventsManager &events = *_vm->_events; Palette &palette = *_vm->_palette; Common::Point size; @@ -693,7 +693,7 @@ void Screen::panTransition(MSurface &newScreen, byte *palData, int entrySide, startX = size.x - 1; deltaX = startX ? -1 : 1; - if (setPalette & !throughBlack) + if (setPalette_ & !throughBlack) palette.setFullPalette(palData); // TODO: Original uses a different frequency ticks counter. Need to @@ -731,7 +731,7 @@ void Screen::panTransition(MSurface &newScreen, byte *palData, int entrySide, g_system->delayMillis(1); } - if ((setPalette && !loop) || throughBlack == THROUGH_BLACK2) + if ((setPalette_ && !loop) || throughBlack == THROUGH_BLACK2) palette.setFullPalette(palData); } |