From: Rudolf Polzer Date: Thu, 18 Nov 2010 16:13:08 +0000 (+0100) Subject: switch over to pango rendering X-Git-Tag: xonotic-v0.5.0~144^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9bd26c2ebe68fb3e8c562b2c36622e5e5d6f3031;p=xonotic%2Fnetradiant.git switch over to pango rendering --- diff --git a/libs/gtkutil/glfont.cpp b/libs/gtkutil/glfont.cpp index eee1113e..91090f3c 100644 --- a/libs/gtkutil/glfont.cpp +++ b/libs/gtkutil/glfont.cpp @@ -129,7 +129,7 @@ GLFont *glfont_create(const char* font_string) return new GLFontCallList(font_list_base, fontInfo->ascent, fontInfo->descent, fontInfo->ascent + fontInfo->descent); } -#else +#elif 0 #include @@ -181,7 +181,7 @@ GLFont *glfont_create(const char* font_string) } #endif -// new font code ripped from ZeroRadiant (not in use yet) +// new font code ripped from ZeroRadiant #include #include @@ -339,3 +339,8 @@ class GLFontInternal: public GLFont return font_height; } }; + +GLFont *glfont_create(const char* font_string) +{ + return new GLFontInternal(font_string); +}