From f5e70b67b5e0cd187ddd8c76f13ba7dcf5661e5f Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 28 Aug 2006 06:05:04 +0000 Subject: [PATCH] (svn r6180) Use a switch instead of function pointers to choose the blitter --- gfx.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gfx.c b/gfx.c index 705424e0b1..09dddfe520 100644 --- a/gfx.c +++ b/gfx.c @@ -1380,19 +1380,6 @@ static void GfxMainBlitter(const Sprite *sprite, int x, int y, int mode) BlitterParams bp; int zoom_mask = ~((1 << dpi->zoom) - 1); - static const BlitZoomFunc zf_tile[3] = - { - GfxBlitTileZoomIn, - GfxBlitTileZoomMedium, - GfxBlitTileZoomOut - }; - static const BlitZoomFunc zf_uncomp[3] = - { - GfxBlitZoomInUncomp, - GfxBlitZoomMediumUncomp, - GfxBlitZoomOutUncomp - }; - /* decode sprite header */ x += sprite->x_offs; y += sprite->y_offs; @@ -1450,7 +1437,12 @@ static void GfxMainBlitter(const Sprite *sprite, int x, int y, int mode) if (bp.width <= 0) return; } - zf_tile[dpi->zoom](&bp); + switch (dpi->zoom) { + default: NOT_REACHED(); + case 0: GfxBlitTileZoomIn(&bp); break; + case 1: GfxBlitTileZoomMedium(&bp); break; + case 2: GfxBlitTileZoomOut(&bp); break; + } } else { bp.sprite += bp.width * (bp.height & ~zoom_mask); bp.height &= zoom_mask; @@ -1487,7 +1479,12 @@ static void GfxMainBlitter(const Sprite *sprite, int x, int y, int mode) if (bp.width <= 0) return; } - zf_uncomp[dpi->zoom](&bp); + switch (dpi->zoom) { + default: NOT_REACHED(); + case 0: GfxBlitZoomInUncomp(&bp); break; + case 1: GfxBlitZoomMediumUncomp(&bp); break; + case 2: GfxBlitZoomOutUncomp(&bp); break; + } } }