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.cpp | |
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.cpp')
-rw-r--r-- | saga/font.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/saga/font.cpp b/saga/font.cpp index 18f2aaf276..31394f8b20 100644 --- a/saga/font.cpp +++ b/saga/font.cpp @@ -100,7 +100,7 @@ int FONT_Init(void) int FONT_Shutdown(void) { - int i; +// int i; R_printf(R_STDOUT, "FONT_Shutdown(): Freeing fonts.\n"); /* @@ -498,7 +498,7 @@ FONT_GetStringWidth(int font_id, size_t ct; int width = 0; int ch; - uchar *txt_p; + const uchar *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 = (uchar *) test_str; + txt_p = (const uchar *) test_str; for (ct = test_str_ct; *txt_p && (!test_str_ct || ct > 0); txt_p++, ct--) { @@ -623,7 +623,7 @@ FONT_Out(R_FONT_STYLE * draw_font, return R_SUCCESS; } - draw_str_p = (uchar *) draw_str; + draw_str_p = (const uchar *) draw_str; ct = draw_str_ct; /* Draw string one character at a time, maximum of 'draw_str'_ct |