cpp/openttd-patchpack/source Changeset - r9511:e930c639a475

Changeset - r9511:e930c639a475

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 16 years ago 2008-06-13 00:00:04
smatz@openttd.org

(svn r13502) -Fix (r11212): drawing of zoomed out partial sprites could cause deadlocks or crashes

1 file changed with 6 insertions and 3 deletions:

src/gfx.cpp

0 comments (0 inline, 0 general)

src/gfx.cpp

➞

Show inline comments

@@ @@ -689,7 +689,7 @@ void DrawSprite(SpriteID img, SpriteID p @@
+	}
+}
-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 @@
 	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 @@
 		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);
+}

0 comments (0 inline, 0 general)