load the freetype library in Font_Init already, and don't call Font_Init twice

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9770 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/ft2.c b/ft2.c
index dc3476a06c98f3a03fe8c241c0fca74757b460b3..ee84d5a67b682b4ee1b855f35aad81ccc7d8d385 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -263,6 +263,8 @@ void Font_Init(void)
        Cvar_RegisterVariable(&r_font_antialias);
        Cvar_RegisterVariable(&r_font_kerning);
        Cvar_RegisterVariable(&developer_font);
+       // let's open it at startup already
+       Font_OpenLibrary();
 }
 
 /*

diff --git a/gl_draw.c b/gl_draw.c
index 425c515911cc79452346a4cb8d3e8cfe4d4e9ff4..689a8614447821d2227ba5ca0283baff6b804de2 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -860,7 +860,6 @@ void GL_Draw_Init (void)
        for(i = 0, j = 0; i < MAX_USERFONTS; ++i)
                if(!FONT_USER[i].title[0])
                        dpsnprintf(FONT_USER[i].title, sizeof(FONT_USER[i].title), "user%d", j++);
-       Font_Init();
 }
 
 void _DrawQ_Setup(void)