From e40f835a7efae2cb00b626ab6b66951c16bc1337 Mon Sep 17 00:00:00 2001 From: smatz Date: Fri, 13 Jun 2008 00:00:04 +0000 Subject: [PATCH] (svn r13502) -Fix (r11212): drawing of zoomed out partial sprites could cause deadlocks or crashes --- src/gfx.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gfx.cpp b/src/gfx.cpp index ac9e32fb6e..676e68ffcc 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -689,7 +689,7 @@ void DrawSprite(SpriteID img, SpriteID pal, int x, int y, const SubSprite *sub) } } -static inline void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMode mode, const SubSprite *sub) +static void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMode mode, const SubSprite *sub) { const DrawPixelInfo *dpi = _cur_dpi; Blitter::BlitterParams bp; @@ -715,8 +715,8 @@ static inline void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMod bp.height = UnScaleByZoom(sprite->height - clip_top - clip_bottom, dpi->zoom); bp.top = 0; bp.left = 0; - bp.skip_left = UnScaleByZoom(clip_left, dpi->zoom); - bp.skip_top = UnScaleByZoom(clip_top, dpi->zoom); + bp.skip_left = UnScaleByZoomLower(clip_left, dpi->zoom); + bp.skip_top = UnScaleByZoomLower(clip_top, dpi->zoom); x += ScaleByZoom(bp.skip_left, dpi->zoom); y += ScaleByZoom(bp.skip_top, dpi->zoom); @@ -767,6 +767,9 @@ static inline void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMod if (bp.width <= 0) return; } + assert(bp.skip_left + bp.width <= UnScaleByZoom(sprite->width, dpi->zoom)); + assert(bp.skip_top + bp.height <= UnScaleByZoom(sprite->height, dpi->zoom)); + BlitterFactoryBase::GetCurrentBlitter()->Draw(&bp, mode, dpi->zoom); }