From 2618d960e30882c097ba8b68249bbae974700ac8 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 2 Jan 2014 22:41:58 +0000 Subject: (svn r26209) -Codechange: remove some template magic and simplify some code --- src/gfx.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gfx.cpp') diff --git a/src/gfx.cpp b/src/gfx.cpp index 7f488699b..a6ab37a23 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -73,7 +73,7 @@ extern uint _dirty_block_colour; void GfxScroll(int left, int top, int width, int height, int xo, int yo) { - Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); + Blitter *blitter = BlitterFactory::GetCurrentBlitter(); if (xo == 0 && yo == 0) return; @@ -105,7 +105,7 @@ void GfxScroll(int left, int top, int width, int height, int xo, int yo) */ void GfxFillRect(int left, int top, int right, int bottom, int colour, FillRectMode mode) { - Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); + Blitter *blitter = BlitterFactory::GetCurrentBlitter(); const DrawPixelInfo *dpi = _cur_dpi; void *dst; const int otop = top; @@ -166,7 +166,7 @@ void GfxFillRect(int left, int top, int right, int bottom, int colour, FillRectM */ static inline void GfxDoDrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash = 0) { - Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); + Blitter *blitter = BlitterFactory::GetCurrentBlitter(); assert(width > 0); @@ -929,7 +929,7 @@ static void GfxBlitter(const Sprite * const sprite, int x, int y, BlitterMode mo /* We do not want to catch the mouse. However we also use that spritenumber for unknown (text) sprites. */ if (_newgrf_debug_sprite_picker.mode == SPM_REDRAW && sprite_id != SPR_CURSOR_MOUSE) { - Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); + Blitter *blitter = BlitterFactory::GetCurrentBlitter(); void *topleft = blitter->MoveTo(bp.dst, bp.left, bp.top); void *bottomright = blitter->MoveTo(topleft, bp.width - 1, bp.height - 1); @@ -943,7 +943,7 @@ static void GfxBlitter(const Sprite * const sprite, int x, int y, BlitterMode mo } } - BlitterFactoryBase::GetCurrentBlitter()->Draw(&bp, mode, zoom); + BlitterFactory::GetCurrentBlitter()->Draw(&bp, mode, zoom); } static void GfxMainBlitterViewport(const Sprite *sprite, int x, int y, BlitterMode mode, const SubSprite *sub, SpriteID sprite_id) @@ -973,7 +973,7 @@ void DoPaletteAnimations() static int palette_animation_counter = 0; palette_animation_counter += 8; - Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); + Blitter *blitter = BlitterFactory::GetCurrentBlitter(); const Colour *s; const ExtraPaletteValues *ev = &_extra_palette_values; Colour old_val[PALETTE_ANIM_SIZE]; @@ -1173,7 +1173,7 @@ void UndrawMouseCursor() if (_screen.dst_ptr == NULL) return; if (_cursor.visible) { - Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); + Blitter *blitter = BlitterFactory::GetCurrentBlitter(); _cursor.visible = false; blitter->CopyFromBuffer(blitter->MoveTo(_screen.dst_ptr, _cursor.draw_pos.x, _cursor.draw_pos.y), _cursor_backup.GetBuffer(), _cursor.draw_size.x, _cursor.draw_size.y); _video_driver->MakeDirty(_cursor.draw_pos.x, _cursor.draw_pos.y, _cursor.draw_size.x, _cursor.draw_size.y); @@ -1190,7 +1190,7 @@ void DrawMouseCursor() /* Don't draw the mouse cursor if the screen is not ready */ if (_screen.dst_ptr == NULL) return; - Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); + Blitter *blitter = BlitterFactory::GetCurrentBlitter(); int x; int y; int w; @@ -1443,7 +1443,7 @@ void MarkWholeScreenDirty() */ bool FillDrawPixelInfo(DrawPixelInfo *n, int left, int top, int width, int height) { - Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); + Blitter *blitter = BlitterFactory::GetCurrentBlitter(); const DrawPixelInfo *o = _cur_dpi; n->zoom = ZOOM_LVL_NORMAL; -- cgit v1.2.3-70-g09d2