Add "current colour" to GLState.

This simplifies code that was setting and unsetting the global current
colour manually.

1 files changed, 6 insertions, 10 deletions

diff --git a/crawl-ref/source/glwrapper-ogl.cc b/crawl-ref/source/glwrapper-ogl.cc
index 9002e568cd..889cefc189 100644
--- a/crawl-ref/source/glwrapper-ogl.cc
+++ b/crawl-ref/source/glwrapper-ogl.cc
@@ -123,6 +123,12 @@ void OGLStateManager::set(const GLState& state)
             glDisable(GL_ALPHA_TEST);
     }
 
+    if (state.colour != m_current_state.colour)
+    {
+        glColor4f(state.colour.r, state.colour.g,
+                  state.colour.b, state.colour.a);
+    }
+
     m_current_state = state;
 }
 
@@ -209,16 +215,6 @@ void OGLStateManager::reset_view_for_redraw(float x, float y)
     glTranslatef(x, y , 1.0f);
 }
 
-void OGLStateManager::set_current_color(GLW_3VF &color)
-{
-    glColor3f(color.r, color.g, color.b);
-}
-
-void OGLStateManager::set_current_color(VColour &color)
-{
-    glColor4f(color.r, color.g, color.b, color.a);
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // OGLShapeBuffer