summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-31 16:27:45 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-31 16:27:45 +0300
commit7727d21503e38af4a594bca656e641ed8647a952 (patch)
treec768f892cfa7160779290c5e2481fdae36c662f4 /src
parent36e7d0706fe0abb6247d2a56c7f82ef7714ea61d (diff)
downloadmv-7727d21503e38af4a594bca656e641ed8647a952.tar.gz
mv-7727d21503e38af4a594bca656e641ed8647a952.tar.bz2
mv-7727d21503e38af4a594bca656e641ed8647a952.tar.xz
mv-7727d21503e38af4a594bca656e641ed8647a952.zip
fix compilation with old compilers.
Diffstat (limited to 'src')
-rw-r--r--src/sdlgraphics.cpp2
-rw-r--r--src/surfacegraphics.cpp9
2 files changed, 3 insertions, 8 deletions
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
}