From 7727d21503e38af4a594bca656e641ed8647a952 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 31 Aug 2013 16:27:45 +0300
Subject: fix compilation with old compilers.

---
 src/sdlgraphics.cpp     | 2 --
 src/surfacegraphics.cpp | 9 +++------
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/sdlgraphics.cpp b/src/sdlgraphics.cpp
index fc9f949a1..084a0db34 100644
--- a/src/sdlgraphics.cpp
+++ b/src/sdlgraphics.cpp
@@ -37,8 +37,6 @@
 
 #include <guichan/sdl/sdlpixel.hpp>
 
-#include <SDL_gfxBlitFunc.h>
-
 #include "debug.h"
 
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
diff --git a/src/surfacegraphics.cpp b/src/surfacegraphics.cpp
index 6dbb3ff70..0c9b6fa37 100644
--- a/src/surfacegraphics.cpp
+++ b/src/surfacegraphics.cpp
@@ -30,13 +30,10 @@
 #include "logger.h"
 
 #include "resources/imagehelper.h"
+#include "resources/surfaceimagehelper.h"
 
 #include <guichan/sdl/sdlpixel.hpp>
 
-#ifndef USE_SDL2
-#include <SDL_gfxBlitFunc.h>
-#endif
-
 #include "debug.h"
 
 SurfaceGraphics::SurfaceGraphics() :
@@ -83,8 +80,8 @@ bool SurfaceGraphics::drawImage2(const Image *const image, int srcX, int srcY,
     }
     else
     {
-        return !(SDL_gfxBlitRGBA(image->mSDLSurface, &srcRect,
-                                 mTarget, &dstRect) < 0);
+        return !(SurfaceImageHelper::combineSurface(
+            image->mSDLSurface, &srcRect, mTarget, &dstRect) < 0);
     }
 #endif
 }
-- 
cgit v1.2.3-70-g09d2