diff options
author | Paul Gilbert | 2012-01-02 09:27:24 +1100 |
---|---|---|
committer | Paul Gilbert | 2012-01-02 09:27:24 +1100 |
commit | 3f17a3ff252e802858912818f166539604d8fb86 (patch) | |
tree | 5970cae14afba0af5450819ccfa5304923519277 | |
parent | e2ded73d923a2be759b272ebca7c989603ef0f31 (diff) | |
download | scummvm-rg350-3f17a3ff252e802858912818f166539604d8fb86.tar.gz scummvm-rg350-3f17a3ff252e802858912818f166539604d8fb86.tar.bz2 scummvm-rg350-3f17a3ff252e802858912818f166539604d8fb86.zip |
TSAGE: Simplified some of the dirty rect code to use existing Rect methods
-rw-r--r-- | engines/tsage/graphics.cpp | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp index 4db898662f..4b9a4ad5ad 100644 --- a/engines/tsage/graphics.cpp +++ b/engines/tsage/graphics.cpp @@ -659,7 +659,7 @@ void GfxSurface::mergeDirtyRects() { rInner = rOuter; while (++rInner != _dirtyRects.end()) { - if (looseIntersectRectangle(*rOuter, *rInner)) { + if ((*rOuter).intersects(*rInner)) { // these two rectangles overlap or // are next to each other - merge them @@ -676,22 +676,6 @@ void GfxSurface::mergeDirtyRects() { } /** - * Check if the two rectangles are next to each other. - * @param pSrc1 a source rectangle - * @param pSrc2 a source rectangle - */ -bool GfxSurface::looseIntersectRectangle(const Rect &src1, const Rect &src2) { - Rect destRect; - - destRect.left = MAX(src1.left, src2.left); - destRect.top = MAX(src1.top, src2.top); - destRect.right = MIN(src1.right, src2.right); - destRect.bottom = MIN(src1.bottom, src2.bottom); - - return destRect.isValidRect(); -} - -/** * Creates the union of two rectangles. * Returns True if there is a union. * @param pDest destination rectangle that is to receive the new union @@ -699,10 +683,8 @@ bool GfxSurface::looseIntersectRectangle(const Rect &src1, const Rect &src2) { * @param pSrc2 a source rectangle */ bool GfxSurface::unionRectangle(Common::Rect &destRect, const Rect &src1, const Rect &src2) { - destRect.left = MIN(src1.left, src2.left); - destRect.top = MIN(src1.top, src2.top); - destRect.right = MAX(src1.right, src2.right); - destRect.bottom = MAX(src1.bottom, src2.bottom); + destRect = src1; + destRect.extend(src2); return !destRect.isEmpty(); } |