From: blub <blub@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 2 Jan 2010 17:13:23 +0000 (+0000)
Subject: load the freetype library in Font_Init already, and don't call Font_Init twice
X-Git-Tag: xonotic-v0.1.0preview~878
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=817dd1b36cd33c36f8250585f2a5b93dd14dfbf2;p=xonotic%2Fdarkplaces.git

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 dc3476a0..ee84d5a6 100644
--- 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 425c5159..689a8614 100644
--- 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)