From 6a92182d9f24f7003f634c0b6a21af418daef442 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 12 May 2006 23:45:30 +0000
Subject: Set color back to current color instead of setting it to white. Fixes
 white rectangles in equipment window.

---
 ChangeLog              | 7 ++++++-
 src/openglgraphics.cpp | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c70c2560..d3334a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-05-12  Björn Steinbrink <B.Steinbrink@gmx.de>
+2006-05-13  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/openglgraphics.cpp: Set color back to current color instead of
+	setting it to white. Fixes white rectangles in equipment window.
+
+2006-05-12  Björn Steinbrink <B.Steinbrink@gmx.de>
 
 	* src/being.cpp: Fixed initialization order in Being ctor.
 
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 1e8918cb..dc14b6c6 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -96,7 +96,7 @@ bool OpenGLGraphics::drawImage(Image *image, int srcX, int srcY,
 
     drawTexedQuad(dstX, dstY, width, height, texX1, texY1, texX2, texY2);
 
-    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+    glColor4ub(mColor.r, mColor.g, mColor.b, mColor.a);
 
     return true;
 }
-- 
cgit v1.2.3-70-g09d2