diff options
| author | Eugene Sandulenko | 2004-04-30 23:02:23 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2004-04-30 23:02:23 +0000 |
| commit | 1353e2d2dc8cf794279f4bc8f9ae12eb31accc35 (patch) | |
| tree | 15b6bdcdce6449ce4f245cfd0fb200b8b2beeb30 /saga/font.cpp | |
| parent | 06d9f402df8c1be896f0b369ceacf81d1488663d (diff) | |
| download | scummvm-rg350-1353e2d2dc8cf794279f4bc8f9ae12eb31accc35.tar.gz scummvm-rg350-1353e2d2dc8cf794279f4bc8f9ae12eb31accc35.tar.bz2 scummvm-rg350-1353e2d2dc8cf794279f4bc8f9ae12eb31accc35.zip | |
Move from custom unsigned types to those provided by main config.h
svn-id: r13687
Diffstat (limited to 'saga/font.cpp')
| -rw-r--r-- | saga/font.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/saga/font.cpp b/saga/font.cpp index 5894b0d6c3..ce3f497396 100644 --- a/saga/font.cpp +++ b/saga/font.cpp @@ -125,18 +125,18 @@ int FONT_Shutdown(void) return R_SUCCESS; } -int FONT_Load(ulong font_rn, int font_id) +int FONT_Load(uint32 font_rn, int font_id) { R_FONT_HEADER fh; R_FONT *font; R_FONT_STYLE *normal_font; - uchar *fontres_p; + byte *fontres_p; size_t fontres_len; size_t remain; - const uchar *read_p; + const byte *read_p; int nbits; int c; @@ -498,7 +498,7 @@ FONT_GetStringWidth(int font_id, size_t ct; int width = 0; int ch; - const uchar *txt_p; + const byte *txt_p; if (!FontModule.init) { return R_FAILURE; @@ -516,7 +516,7 @@ FONT_GetStringWidth(int font_id, font = FontModule.fonts[font_id]; assert(font != NULL); - txt_p = (const uchar *) test_str; + txt_p = (const byte *) test_str; for (ct = test_str_ct; *txt_p && (!test_str_ct || ct > 0); txt_p++, ct--) { @@ -598,16 +598,16 @@ FONT_Out(R_FONT_STYLE * draw_font, size_t draw_str_ct, int text_x, int text_y, int color) { - const uchar *draw_str_p; + const byte *draw_str_p; - uchar *c_data_ptr; + byte *c_data_ptr; int c_code; int char_row; - uchar *output_ptr; - uchar *output_ptr_min; - uchar *output_ptr_max; + byte *output_ptr; + byte *output_ptr_min; + byte *output_ptr_max; int row; int row_limit; @@ -623,7 +623,7 @@ FONT_Out(R_FONT_STYLE * draw_font, return R_SUCCESS; } - draw_str_p = (const uchar *) draw_str; + draw_str_p = (const byte *) draw_str; ct = draw_str_ct; /* Draw string one character at a time, maximum of 'draw_str'_ct @@ -700,7 +700,7 @@ FONT_Out(R_FONT_STYLE * draw_font, c_bit--) { if ((*c_data_ptr >> c_bit) & 0x01) { - *output_ptr = (uchar) color; + *output_ptr = (byte) color; } output_ptr++; |