From cd6d5e6237acf659d75fa64568506c152ce41ec9 Mon Sep 17 00:00:00 2001 From: Jakob Fries Date: Tue, 25 Dec 2007 03:25:13 +0000 Subject: new fonts added, lots more magic font code added, server bug fixed --- src/engine/client/ec_font.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/engine/client/ec_font.h') diff --git a/src/engine/client/ec_font.h b/src/engine/client/ec_font.h index 6b4d5910..a68a8452 100644 --- a/src/engine/client/ec_font.h +++ b/src/engine/client/ec_font.h @@ -18,10 +18,11 @@ CHARACTER; typedef struct { - int texture; + int text_texture; + int outline_texture; int size; CHARACTER characters[256]; - float kerning[256*256]; + char kerning[256*256]; } FONT; typedef struct @@ -31,8 +32,8 @@ typedef struct } FONT_SET; int font_load(FONT *font, const char *filename); -int font_set_load(FONT_SET *font_set, const char *font_filename, const char *texture_filename, int fonts, ...); -float font_string_width(FONT_SET *font_set, const char *string, float size); +int font_set_load(FONT_SET *font_set, const char *font_filename, const char *text_texture_filename, const char *outline_texture_filename, int fonts, ...); +float font_text_width(FONT *font, const char *text, float size, int width); void font_character_info(FONT *font, unsigned char c, float *tex_x0, float *tex_y0, float *tex_x1, float *tex_y1, float *width, float *height, float *x_offset, float *y_offset, float *x_advance); float font_kerning(FONT *font, unsigned char c1, unsigned char c2); FONT *font_set_pick(FONT_SET *font_set, float size); -- cgit 1.4.1