diff options
| author | Jakob Fries <jakob.fries@gmail.com> | 2007-12-24 13:11:52 +0000 |
|---|---|---|
| committer | Jakob Fries <jakob.fries@gmail.com> | 2007-12-24 13:11:52 +0000 |
| commit | 23d50255d2527c2aa1fa15964f0fd22d0ba95bc2 (patch) | |
| tree | 0cbad64fccdc7b8d36a72309e9b29831f40f1bdc /src | |
| parent | a02611511c1704c653e5951a44b294a953cdb470 (diff) | |
| download | zcatch-23d50255d2527c2aa1fa15964f0fd22d0ba95bc2.tar.gz zcatch-23d50255d2527c2aa1fa15964f0fd22d0ba95bc2.zip | |
fixed font stuffs
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/client/ec_font.c | 2 | ||||
| -rw-r--r-- | src/game/client/gc_menu.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/client/ec_font.c b/src/engine/client/ec_font.c index 71a26cd5..33a8deea 100644 --- a/src/engine/client/ec_font.c +++ b/src/engine/client/ec_font.c @@ -63,7 +63,7 @@ int font_load(FONT *font, const char *filename) float height = font_data.characters[i].height*scale_factor_y; float x_offset = font_data.characters[i].x_offset*scale_factor_x; float y_offset = font_data.characters[i].y_offset*scale_factor_y; - float x_advance = (font_data.characters[i].x_advance>>6)*scale_factor_x; + float x_advance = (font_data.characters[i].x_advance)*scale_factor_x; font->characters[i].tex_x0 = tex_x0; font->characters[i].tex_y0 = tex_y0; diff --git a/src/game/client/gc_menu.cpp b/src/game/client/gc_menu.cpp index a45b065c..c4b20372 100644 --- a/src/game/client/gc_menu.cpp +++ b/src/game/client/gc_menu.cpp @@ -1884,7 +1884,7 @@ int menu2_render() if (first) { - font_set_load(&font_set, "fonts/vera%d.tfnt", "fonts/vera%d.png", 4, 8, 10, 12, 14); + font_set_load(&font_set, "fonts/DefaultFont_%dpx_32bit_outline.tfnt", "fonts/DefaultFont_%dpx_32bit_outline_00.png", 7, 10, 11, 12, 13, 14, 16, 36); first = false; } |