From 18f5c9c0e334a445bbe1a3eb12ac3bf293d80d2c Mon Sep 17 00:00:00 2001 From: Nathanael Gentry Date: Fri, 3 Jul 2020 16:30:32 -0400 Subject: [PATCH] DIRECTOR: Merge dirty rect utility function --- engines/director/stage.cpp | 9 +-------- engines/director/stage.h | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/engines/director/stage.cpp b/engines/director/stage.cpp index 770ccd2cd89..85fa92380a2 100644 --- a/engines/director/stage.cpp +++ b/engines/director/stage.cpp @@ -121,7 +121,7 @@ void Stage::mergeDirtyRects() { if ((*rOuter).intersects(*rInner)) { // These two rectangles overlap, so merge them - unionRectangle(*rOuter, *rOuter, *rInner); + rOuter->extend(*rInner); // remove the inner rect from the list _dirtyRects.erase(rInner); @@ -133,13 +133,6 @@ void Stage::mergeDirtyRects() { } } -bool Stage::unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2) { - destRect = src1; - destRect.extend(src2); - - return !destRect.isEmpty(); -} - void Stage::inkBlitFrom(Channel *channel, Common::Rect destRect, Graphics::ManagedSurface *blitTo) { Common::Rect srcRect = channel->getBbox(); destRect.clip(srcRect); diff --git a/engines/director/stage.h b/engines/director/stage.h index 9ef0aac45c5..d002e6c7e30 100644 --- a/engines/director/stage.h +++ b/engines/director/stage.h @@ -47,7 +47,6 @@ class Stage : public Graphics::MacWindow { bool render(bool forceRedraw = false, Graphics::ManagedSurface *blitTo = nullptr); - bool unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2); void setStageColor(uint stageColor); void addDirtyRect(const Common::Rect &r); void mergeDirtyRects();