diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-17 22:16:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-17 22:26:48 +0300 |
| commit | 1d71d02a40dc1f4c50572bf0681bbc2907a3c361 (patch) | |
| tree | 6924bf72d1f5427b1071fdd477b599909e045e32 /src/render | |
| parent | a520c88cabf03973ddf27435eb5a970f9c214d30 (diff) | |
| download | manaverse-1d71d02a40dc1f4c50572bf0681bbc2907a3c361.tar.gz manaverse-1d71d02a40dc1f4c50572bf0681bbc2907a3c361.tar.bz2 manaverse-1d71d02a40dc1f4c50572bf0681bbc2907a3c361.tar.xz manaverse-1d71d02a40dc1f4c50572bf0681bbc2907a3c361.zip | |
move sdlpixel file into utils directory.
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/sdl2graphics.cpp | 2 | ||||
| -rw-r--r-- | src/render/sdl2softwaregraphics.cpp | 4 | ||||
| -rw-r--r-- | src/render/sdlgraphics.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index 46d8360b6..2cd7c965e 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -79,7 +79,7 @@ #include "utils/sdlcheckutils.h" -#include "gui/base/sdl/sdlpixel.hpp" +#include "utils/sdlpixel.h" #include "debug.h" diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index e78a87c7e..8efd73d68 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -36,7 +36,7 @@ #include "utils/sdlcheckutils.h" -#include "gui/base/sdl/sdlpixel.hpp" +#include "utils/sdlpixel.h" #include "debug.h" @@ -967,7 +967,7 @@ void SDL2SoftwareGraphics::fillRectangle(const gcn::Rectangle &rectangle) for (x = x1; x < x2; x++) { uint8_t *const p = p0 + x * 2; - *reinterpret_cast<uint16_t *>(p) = gcn::SDLAlpha16( + *reinterpret_cast<uint16_t *>(p) = SDLAlpha16( static_cast<uint16_t>(pixel), *reinterpret_cast<uint16_t *>(p), static_cast<uint8_t>(mColor.a), mSurface->format); diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index 2226be0da..7a15713be 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -31,7 +31,7 @@ #include "utils/sdlcheckutils.h" -#include "gui/base/sdl/sdlpixel.hpp" +#include "utils/sdlpixel.h" #include "debug.h" @@ -963,7 +963,7 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) for (x = x1; x < x2; x++) { uint8_t *const p = p0 + x * 2; - *reinterpret_cast<uint16_t *>(p) = gcn::SDLAlpha16( + *reinterpret_cast<uint16_t *>(p) = SDLAlpha16( static_cast<uint16_t>(pixel), *reinterpret_cast<uint16_t *>(p), static_cast<uint8_t>(mColor.a), mWindow->format); |