summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
commit48646db55005a0da079bd2c945875dc8225e2f86 (patch)
tree4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/utils
parent9c12fcdfe590f34543fcecc2691b625c408f1746 (diff)
downloadManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz
ManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2
ManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz
ManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.zip
Move color into gui dir.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/sdlpixel.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/utils/sdlpixel.h b/src/utils/sdlpixel.h
index a01858831..282b90afb 100644
--- a/src/utils/sdlpixel.h
+++ b/src/utils/sdlpixel.h
@@ -64,8 +64,9 @@
#ifndef UTILS_SDLPIXEL_H
#define UTILS_SDLPIXEL_H
+#include "gui/color.h"
+
#include "SDL.h"
-#include "gui/base/color.hpp"
/**
* Puts a pixel on an SDL_Surface.
@@ -75,7 +76,7 @@
* @param color the color the pixel should be in.
*/
inline void SDLputPixel(SDL_Surface* surface, int x, int y,
- const gcn::Color& color)
+ const Color& color)
{
if (!surface)
return;
@@ -175,7 +176,7 @@ inline unsigned short SDLAlpha16(const unsigned short src,
* @param color the color the pixel should be in.
*/
inline void SDLputPixelAlpha(SDL_Surface* surface, int x, int y,
- const gcn::Color& color)
+ const Color& color)
{
const int bpp = surface->format->BytesPerPixel;