From c8465553c8a3d86dc1dda153e94f40331aa687d1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 26 Dec 2012 16:40:49 +0300
Subject: Move setColor from guichan to own graphics class.

---
 src/graphics.cpp                | 6 ++++++
 src/graphics.h                  | 2 ++
 src/guichan/sdl/sdlgraphics.cpp | 5 +----
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/graphics.cpp b/src/graphics.cpp
index 2086981de..c6f8cf57a 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -1206,3 +1206,9 @@ void Graphics::fillRectangle(const gcn::Rectangle& rectangle)
         SDL_FillRect(mTarget, &rect, color);
     }
 }
+
+void Graphics::setColor(const gcn::Color &color)
+{
+    mColor = color;
+    mAlpha = (color.a != 255);
+}
diff --git a/src/graphics.h b/src/graphics.h
index 84a4a8418..0c62191e5 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -327,6 +327,8 @@ class Graphics : public gcn::SDLGraphics
         virtual void initArrays()
         { }
 
+        void setColor(const gcn::Color &color);
+
 #ifdef DEBUG_DRAW_CALLS
         virtual unsigned int getDrawCalls() const
         { return 0; }
diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp
index eae2bb035..85efd5ef6 100644
--- a/src/guichan/sdl/sdlgraphics.cpp
+++ b/src/guichan/sdl/sdlgraphics.cpp
@@ -572,11 +572,8 @@ namespace gcn
         }
     }
 
-    void SDLGraphics::setColor(const Color& color)
+    void SDLGraphics::setColor(const Color& color A_UNUSED)
     {
-        mColor = color;
-
-        mAlpha = color.a != 255;
     }
 
     const Color& SDLGraphics::getColor() const
-- 
cgit v1.2.3-70-g09d2