From bfc2d4e3269851e7d55fb9a58a03a94c64f163d9 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Tue, 21 Apr 2020 14:59:05 +0100 Subject: [PATCH] ...Maybe I should test my fixes before commit --- src/Draw.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Draw.cpp b/src/Draw.cpp index 8fbbdcfc..6e5659c2 100644 --- a/src/Draw.cpp +++ b/src/Draw.cpp @@ -420,7 +420,7 @@ void BackupSurface(SurfaceID surf_no, const RECT *rect) scaled_rect.bottom = rect->bottom * magnification; // Do not draw invalid RECTs - if (rcWork->right <= rcWork->left || rcWork->bottom <= rcWork->top) + if (scaled_rect.right <= scaled_rect.left || scaled_rect.bottom <= scaled_rect.top) return; RenderBackend_Blit(framebuffer, &scaled_rect, surf[surf_no], scaled_rect.left, scaled_rect.top, FALSE); @@ -459,7 +459,7 @@ void PutBitmap3(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID su rcWork.bottom *= magnification; // Do not draw invalid RECTs - if (rcWork->right <= rcWork->left || rcWork->bottom <= rcWork->top) + if (rcWork.right <= rcWork.left || rcWork.bottom <= rcWork.top) return; RenderBackend_Blit(surf[surf_no], &rcWork, framebuffer, x * magnification, y * magnification, TRUE); @@ -498,7 +498,7 @@ void PutBitmap4(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID su rcWork.bottom *= magnification; // Do not draw invalid RECTs - if (rcWork->right <= rcWork->left || rcWork->bottom <= rcWork->top) + if (rcWork.right <= rcWork.left || rcWork.bottom <= rcWork.top) return; RenderBackend_Blit(surf[surf_no], &rcWork, framebuffer, x * magnification, y * magnification, FALSE); @@ -514,7 +514,7 @@ void Surface2Surface(int x, int y, const RECT *rect, int to, int from) rcWork.bottom = rect->bottom * magnification; // Do not draw invalid RECTs - if (rcWork->right <= rcWork->left || rcWork->bottom <= rcWork->top) + if (rcWork.right <= rcWork.left || rcWork.bottom <= rcWork.top) return; RenderBackend_Blit(surf[from], &rcWork, surf[to], x * magnification, y * magnification, TRUE); @@ -539,7 +539,7 @@ void CortBox(const RECT *rect, unsigned long col) const unsigned char blue = (col >> 16) & 0xFF; // Do not draw invalid RECTs - if (dst_rect->right <= dst_rect->left || dst_rect->bottom <= dst_rect->top) + if (dst_rect.right <= dst_rect.left || dst_rect.bottom <= dst_rect.top) return; RenderBackend_ColourFill(framebuffer, &dst_rect, red, green, blue); @@ -560,7 +560,7 @@ void CortBox2(const RECT *rect, unsigned long col, SurfaceID surf_no) const unsigned char blue = (col >> 16) & 0xFF; // Do not draw invalid RECTs - if (dst_rect->right <= dst_rect->left || dst_rect->bottom <= dst_rect->top) + if (dst_rect.right <= dst_rect.left || dst_rect.bottom <= dst_rect.top) return; RenderBackend_ColourFill(surf[surf_no], &dst_rect, red, green, blue);