diff options
author | Max Horn | 2004-04-25 14:42:14 +0000 |
---|---|---|
committer | Max Horn | 2004-04-25 14:42:14 +0000 |
commit | d4f876b37df0fdc772936eedf9b112802987254b (patch) | |
tree | c7e782e5846dd153159c574ca9cb2ca250dfd34f /saga/font.h | |
parent | f9cd78cedd48371f8aa9d98cbcdeb879fe543fac (diff) | |
download | scummvm-rg350-d4f876b37df0fdc772936eedf9b112802987254b.tar.gz scummvm-rg350-d4f876b37df0fdc772936eedf9b112802987254b.tar.bz2 scummvm-rg350-d4f876b37df0fdc772936eedf9b112802987254b.zip |
Fix many warnings; use C++ type system instead of C style typedefs; removed various unused stuff; const correctness; etc.
svn-id: r13622
Diffstat (limited to 'saga/font.h')
-rw-r--r-- | saga/font.h | 20 |
1 files changed, 10 insertions, 10 deletions
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); |