diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-05-12 23:45:30 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-05-12 23:45:30 +0000 |
commit | 6a92182d9f24f7003f634c0b6a21af418daef442 (patch) | |
tree | fc7bc695906c4f197a3aee73f575d5ffca4fbf8a | |
parent | 918548bbb6d64a64c0e3ecf4c7e715cb7ac5ed00 (diff) | |
download | mana-6a92182d9f24f7003f634c0b6a21af418daef442.tar.gz mana-6a92182d9f24f7003f634c0b6a21af418daef442.tar.bz2 mana-6a92182d9f24f7003f634c0b6a21af418daef442.tar.xz mana-6a92182d9f24f7003f634c0b6a21af418daef442.zip |
Set color back to current color instead of setting it to white. Fixes white
rectangles in equipment window.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | src/openglgraphics.cpp | 2 |
2 files changed, 7 insertions, 2 deletions
@@ -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; } |