Clean up storage of vertex colours in GLWRect.

Storing member variable pointers to data, even const ones, is sketchy.
Better to depend on compiler optimizations to eliminate redundant
variable copies.

1 files changed, 6 insertions, 12 deletions

diff --git a/crawl-ref/source/glwrapper-ogl.cc b/crawl-ref/source/glwrapper-ogl.cc
index 696a5bb7d4..78312c485a 100644
--- a/crawl-ref/source/glwrapper-ogl.cc
+++ b/crawl-ref/source/glwrapper-ogl.cc
@@ -276,16 +276,12 @@ void OGLShapeBuffer::add_rect(const GLWRect &rect)
     // Copy vert colours if necessary
     if (m_colour_verts)
     {
-        // ensure that there are no NULL VColours
-        // TODO: Maybe we can have a default colour here? -- ixtli
-        ASSERT(rect.col_bl && rect.col_br && rect.col_tl && rect.col_tr);
-
         last = m_colour_buffer.size();
         m_colour_buffer.resize(last + 4);
-        m_colour_buffer[last    ].set(*rect.col_bl);
-        m_colour_buffer[last + 1].set(*rect.col_tl);
-        m_colour_buffer[last + 2].set(*rect.col_br);
-        m_colour_buffer[last + 3].set(*rect.col_tr);
+        m_colour_buffer[last    ].set(rect.col_s);
+        m_colour_buffer[last + 1].set(rect.col_e);
+        m_colour_buffer[last + 2].set(rect.col_s);
+        m_colour_buffer[last + 3].set(rect.col_e);
     }
 
     // build indices
@@ -340,12 +336,10 @@ void OGLShapeBuffer::add_line(const GLWRect &rect)
     // Copy vert colours if necessary
     if (m_colour_verts)
     {
-        ASSERT(rect.col_bl);
-
         last = m_colour_buffer.size();
         m_colour_buffer.resize(last + 2);
-        m_colour_buffer[last    ].set(*rect.col_bl);
-        m_colour_buffer[last + 1].set(*rect.col_bl);
+        m_colour_buffer[last    ].set(rect.col_s);
+        m_colour_buffer[last + 1].set(rect.col_e);
     }
 }