diff options
| author | Paul Gilbert | 2017-03-30 22:24:20 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-03-30 22:24:20 -0400 |
| commit | 751a96730ef7b43d2f59919b523c07ee685b56c2 (patch) | |
| tree | ee330b9545e6fecaa6424b71373ab5cb5cdaeecf /engines/titanic/star_control/surface_area.cpp | |
| parent | ee644ec01b292c3308085170021f04f6f6917bc9 (diff) | |
| download | scummvm-rg350-751a96730ef7b43d2f59919b523c07ee685b56c2.tar.gz scummvm-rg350-751a96730ef7b43d2f59919b523c07ee685b56c2.tar.bz2 scummvm-rg350-751a96730ef7b43d2f59919b523c07ee685b56c2.zip | |
TITANIC: Fix rect calculation in CSurfaceArea fillRect
Diffstat (limited to 'engines/titanic/star_control/surface_area.cpp')
| -rw-r--r-- | engines/titanic/star_control/surface_area.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/titanic/star_control/surface_area.cpp b/engines/titanic/star_control/surface_area.cpp index a3029bde88..4536d7bf4e 100644 --- a/engines/titanic/star_control/surface_area.cpp +++ b/engines/titanic/star_control/surface_area.cpp @@ -169,11 +169,8 @@ double CSurfaceArea::fillRect(const FRect &rect) { } } - Common::Rect rr((int)(r.left - 0.5), (int)(r.top - 0.5), (int)(r.right - 0.5), (int)(r.bottom - 0.5)); - if (rr.left > rr.right) { - SWAP(rr.left, rr.right); - SWAP(rr.top, rr.bottom); - } + Common::Rect rr((int)(MIN(r.left, r.right) - 0.5), (int)(MIN(r.top, r.bottom) - 0.5), + (int)(MAX(r.left, r.right) - 0.5), (int)(MAX(r.top, r.bottom) - 0.5)); Graphics::Surface s; s.setPixels(_pixelsPtr); |