From 6d7ecb0086759931ccb1daa6ea383305906980b7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 3 Jan 2013 01:44:11 +0300
Subject: Fix SDL_gfx confict from broken header.

---
 src/gui/sdlfont.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/gui/sdlfont.cpp')

diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index 776e04782..d0520447a 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -35,8 +35,6 @@
 
 #include <guichan/exception.hpp>
 
-#include <SDL_gfxBlitFunc.h>
-
 #include "debug.h"
 
 const unsigned int CACHE_SIZE = 256;
@@ -124,18 +122,18 @@ class SDLTextChunk final
                     static_cast<Uint16>(surface->h)
                 };
 //                SDL_SetAlpha(surface2, 0, SDL_ALPHA_OPAQUE);
-                SDL_gfxBlitRGBA(surface2, nullptr, background, &rect);
+                MSDL_gfxBlitRGBA(surface2, nullptr, background, &rect);
                 rect.x = -OUTLINE_SIZE;
-                SDL_gfxBlitRGBA(surface2, nullptr, background, &rect);
+                MSDL_gfxBlitRGBA(surface2, nullptr, background, &rect);
                 rect.x = 0;
                 rect.y = -OUTLINE_SIZE;
-                SDL_gfxBlitRGBA(surface2, nullptr, background, &rect);
+                MSDL_gfxBlitRGBA(surface2, nullptr, background, &rect);
                 rect.y = OUTLINE_SIZE;
-                SDL_gfxBlitRGBA(surface2, nullptr, background, &rect);
+                MSDL_gfxBlitRGBA(surface2, nullptr, background, &rect);
                 rect.x = 0;
                 rect.y = 0;
 //                SDL_SetAlpha(surface, 0, SDL_ALPHA_OPAQUE);
-                SDL_gfxBlitRGBA(surface, nullptr, background, &rect);
+                MSDL_gfxBlitRGBA(surface, nullptr, background, &rect);
                 SDL_FreeSurface(surface);
                 SDL_FreeSurface(surface2);
                 surface = background;
-- 
cgit v1.2.3-60-g2f50