summaryrefslogtreecommitdiff
path: root/src/gui/sdlfont.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-01-03 01:44:11 +0300
committerAndrei Karas <akaras@inbox.ru>2013-01-03 01:44:11 +0300
commit6d7ecb0086759931ccb1daa6ea383305906980b7 (patch)
tree18816a169f5b2def1ac1fb0a8ad5ebd89f1d72b4 /src/gui/sdlfont.cpp
parent0101f3715378644307115e136570959d3d4be3c9 (diff)
downloadplus-6d7ecb0086759931ccb1daa6ea383305906980b7.tar.gz
plus-6d7ecb0086759931ccb1daa6ea383305906980b7.tar.bz2
plus-6d7ecb0086759931ccb1daa6ea383305906980b7.tar.xz
plus-6d7ecb0086759931ccb1daa6ea383305906980b7.zip
Fix SDL_gfx confict from broken header.
Diffstat (limited to 'src/gui/sdlfont.cpp')
-rw-r--r--src/gui/sdlfont.cpp12
1 files changed, 5 insertions, 7 deletions
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;