X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ft2_fontdefs.h;h=8cdc9e1d0ceb3ac6240e1a8ef9e16e51fa0a0e36;hb=1e01840681f92f425aa17e1a18c7dfcf3bf80e40;hp=87fba4c56542dccef8ac4554b9c17bb63af4b544;hpb=0a30db49908c1ebe86961af4366fe1b8312c2cb6;p=xonotic%2Fdarkplaces.git

diff --git a/ft2_fontdefs.h b/ft2_fontdefs.h
index 87fba4c5..8cdc9e1d 100644
--- a/ft2_fontdefs.h
+++ b/ft2_fontdefs.h
@@ -9,7 +9,7 @@
 
 typedef struct glyph_slot_s
 {
-	qboolean image;
+	qbool image;
 	// we keep the quad coords here only currently
 	// if you need other info, make Font_LoadMapForIndex fill it into this slot
 	float txmin; // texture coordinate in [0,1]
@@ -34,8 +34,8 @@ struct ft2_font_map_s
 	float                  intSize;
 	int                    glyphSize;
 
-	rtexture_t            *texture;
-	qboolean               static_tex;
+	cachepic_t            *pic;
+	qbool               static_tex;
 	glyph_slot_t           glyphs[FONT_CHARS_PER_MAP];
 
 	// contains the kerning information for the first 256 characters
@@ -50,12 +50,12 @@ struct ft2_font_map_s
 
 struct ft2_attachment_s
 {
-	unsigned char *data;
+	const unsigned char *data;
 	fs_offset_t    size;
 };
 
-//qboolean Font_LoadMapForIndex(ft2_font_t *font, Uchar _ch, ft2_font_map_t **outmap);
-qboolean Font_LoadMapForIndex(ft2_font_t *font, int map_index, Uchar _ch, ft2_font_map_t **outmap);
+//qbool Font_LoadMapForIndex(ft2_font_t *font, Uchar _ch, ft2_font_map_t **outmap);
+qbool Font_LoadMapForIndex(ft2_font_t *font, int map_index, Uchar _ch, ft2_font_map_t **outmap);
 
 void font_start(void);
 void font_shutdown(void);