summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/glwrapper-ogl.cc
diff options
context:
space:
mode:
authorEnne Walker <enne.walker@gmail.com>2010-05-14 13:09:46 -0400
committerEnne Walker <enne.walker@gmail.com>2010-05-14 18:18:54 -0400
commit46bd9b7116d87b6ebd461b75deefd767fa96895b (patch)
tree338f925084a9215c0f44dfd0d44eb766ec9d847f /crawl-ref/source/glwrapper-ogl.cc
parenta9d79ac529bee0a27b15aaec8124ac324fc21389 (diff)
downloadcrawl-ref-46bd9b7116d87b6ebd461b75deefd767fa96895b.tar.gz
crawl-ref-46bd9b7116d87b6ebd461b75deefd767fa96895b.zip
Clean up unions in glwrapper.h.
Diffstat (limited to 'crawl-ref/source/glwrapper-ogl.cc')
-rw-r--r--crawl-ref/source/glwrapper-ogl.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/crawl-ref/source/glwrapper-ogl.cc b/crawl-ref/source/glwrapper-ogl.cc
index 889cefc189..696a5bb7d4 100644
--- a/crawl-ref/source/glwrapper-ogl.cc
+++ b/crawl-ref/source/glwrapper-ogl.cc
@@ -340,14 +340,12 @@ void OGLShapeBuffer::add_line(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);
+ ASSERT(rect.col_bl);
last = m_colour_buffer.size();
m_colour_buffer.resize(last + 2);
- m_colour_buffer[last ].set(*rect.col_s);
- m_colour_buffer[last + 1].set(*rect.col_e);
+ m_colour_buffer[last ].set(*rect.col_bl);
+ m_colour_buffer[last + 1].set(*rect.col_bl);
}
}