From d4f876b37df0fdc772936eedf9b112802987254b Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 25 Apr 2004 14:42:14 +0000 Subject: Fix many warnings; use C++ type system instead of C style typedefs; removed various unused stuff; const correctness; etc. svn-id: r13622 --- saga/font.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'saga/font.h') diff --git a/saga/font.h b/saga/font.h index a72322c804..1fda4f6248 100644 --- a/saga/font.h +++ b/saga/font.h @@ -55,15 +55,15 @@ namespace Saga { #define SAGA_FONT_HEADER_LEN 6 -typedef struct R_FONT_HEADER_tag { +struct R_FONT_HEADER { int c_height; int c_width; int row_length; -} R_FONT_HEADER; +}; -typedef struct FONT_CHAR_ENTRY_TAG { +struct FONT_CHAR_ENTRY { int index; int byte_width; @@ -71,9 +71,9 @@ typedef struct FONT_CHAR_ENTRY_TAG { int flag; int tracking; -} FONT_CHAR_ENTRY; +}; -typedef struct R_FONT_STYLE_tag { +struct R_FONT_STYLE { R_FONT_HEADER hdr; FONT_CHAR_ENTRY fce[256]; @@ -81,9 +81,9 @@ typedef struct R_FONT_STYLE_tag { uchar *font_free_p; uchar *font_p; -} R_FONT_STYLE; +}; -typedef struct R_FONT_tag { +struct R_FONT { ulong font_rn; int font_id; @@ -96,9 +96,9 @@ typedef struct R_FONT_tag { uchar *res_data; size_t res_len; -} R_FONT; +}; -typedef struct R_FONT_MODULE_tag { +struct R_FONT_MODULE { int init; @@ -110,7 +110,7 @@ typedef struct R_FONT_MODULE_tag { int err_n; const char *err_str; -} R_FONT_MODULE; +}; int FONT_Load(ulong font_rn, int font_id); -- cgit v1.2.3