about summary refs log tree commit diff
path: root/src/game/client/gameclient.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2009-06-07 14:36:54 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2009-06-07 14:36:54 +0000
commitcdc5f26900dc10e10679ba76a30f195e8b3f5505 (patch)
tree415b28219072589b09031c145d34def8e0f8956b /src/game/client/gameclient.cpp
parent4bb1df318905f491740f4298c69cda317fb53fcb (diff)
downloadzcatch-cdc5f26900dc10e10679ba76a30f195e8b3f5505.tar.gz
zcatch-cdc5f26900dc10e10679ba76a30f195e8b3f5505.zip
new font rendering system using freetype2. only compiles under linux for now
Diffstat (limited to 'src/game/client/gameclient.cpp')
-rw-r--r--src/game/client/gameclient.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index 8d0e044c..a90cdc49 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -193,15 +193,12 @@ void GAMECLIENT::on_init()
 	for(int i = 0; i < NUM_NETOBJTYPES; i++)
 		snap_set_staticsize(i, netobj_get_size(i));
 	
-	// load default font	
-	static FONT_SET default_font;
 	int64 start = time_get();
 	
-	int before = gfx_memory_usage();
-	font_set_load(&default_font, "fonts/default_font%d.tfnt", "fonts/default_font%d.png", "fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
-	dbg_msg("font", "gfx memory used for font textures: %d", gfx_memory_usage()-before);
-	
-	gfx_text_set_default_font(&default_font);
+	// load default font	
+	static FONT *default_font;
+	default_font = gfx_font_load("data/fonts/vera.ttf");
+	gfx_text_set_default_font(default_font);
 
 	config.cl_threadsoundloading = 0;