fix a possible bug that can cause ds->shaderInfo to be NULL

[xonotic/netradiant.git] / include / igl.h

diff --git a/include/igl.h b/include/igl.h
index 7ea3b944d93d33ec27dc9e460f360d5c7786c4ca..35174967608d8fed17ea6aaf193f25d709b7bd43 100644 (file)
--- a/include/igl.h
+++ b/include/igl.h
@@ -1976,6 +1976,7 @@ typedef unsigned int GLhandleARB;
 
 #endif
 
+#include "gtkutil/glfont.h"
 
 /// \brief A module which wraps a runtime-binding of the standard OpenGL functions.
 /// Provides convenience functions for querying availabiliy of extensions, rendering text and error-checking.
@@ -1997,16 +1998,12 @@ struct OpenGLBinding
   /// \brief Asserts that there no OpenGL errors have occurred since the last call to glGetError.
   void (*assertNoErrors)(const char *file, int line);
 
-  GLuint m_font;
-  int m_fontHeight;
-  int m_fontAscent;
-  int m_fontDescent;
+  GLFont *m_font; // MUST be set!
 
   /// \brief Renders \p string at the current raster-position of the current context.
   void drawString(const char* string) const
   {
-    m_glListBase(m_font);
-    m_glCallLists(GLsizei(strlen(string)), GL_UNSIGNED_BYTE, reinterpret_cast<const GLubyte*>(string));
+    m_font->printString(string);
   }
 
   /// \brief Renders \p character at the current raster-position of the current context.