diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-12-31 12:40:55 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-12-31 12:40:55 +0300 |
commit | 0e3e3df8c385ed8ad6e4612570016ffae03169a6 (patch) | |
tree | 839b82ee1a87f70d47b73535832454716d7dd619 | |
parent | b85fd67fb14f6a49c7e71f2265254150ba7a1240 (diff) | |
download | manaverse-0e3e3df8c385ed8ad6e4612570016ffae03169a6.tar.gz manaverse-0e3e3df8c385ed8ad6e4612570016ffae03169a6.tar.bz2 manaverse-0e3e3df8c385ed8ad6e4612570016ffae03169a6.tar.xz manaverse-0e3e3df8c385ed8ad6e4612570016ffae03169a6.zip |
fix compilation errors with different flags.
-rw-r--r-- | src/render/sdl2graphics.cpp | 2 | ||||
-rw-r--r-- | src/render/sdl2softwaregraphics.cpp | 4 | ||||
-rw-r--r-- | src/render/sdlgraphics.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index 92dfc3309..fa6d052a1 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -238,7 +238,7 @@ void SDLGraphics::drawPattern(const Image *const image, const int x, const int y, const int w, const int h) { - drawParrernInline(image, x, y, w, h); + drawPatternInline(image, x, y, w, h); } void SDLGraphics::drawPatternInline(const Image *const image, diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index daaa75387..f1581d6a2 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -216,7 +216,7 @@ void SDL2SoftwareGraphics::drawImageCached(const Image *const image, SDL_Surface *const src = image->mSDLSurface; int srcX = bounds.x; - const int srcY = bounds.y; + int srcY = bounds.y; x += top.xOffset; y += top.yOffset; @@ -667,7 +667,7 @@ void SDL2SoftwareGraphics::calcPattern(ImageCollection* const vertCol, vert = vertCol->currentVert; } - calcImagePattern(vert, image, x, y, w, h); + calcPatternInline(vert, image, x, y, w, h); } void SDL2SoftwareGraphics::calcTileVertexes(ImageVertexes *const vert, diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index 37d26689e..b384e163e 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -104,7 +104,7 @@ bool SDLGraphics::drawRescaledImage(const Image *const image, bool SDLGraphics::drawImage2(const Image *const image, int dstX, int dstY) { - drawImageInline(image, dstX, dstY); + return drawImageInline(image, dstX, dstY); } bool SDLGraphics::drawImageInline(const Image *const image, |