diff options
author | Eugene Sandulenko | 2004-08-03 00:06:18 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2004-08-03 00:06:18 +0000 |
commit | fe1ab79beeec83d156572c12a8f3e1cb874d7d7d (patch) | |
tree | 8e0d76681289fa5caa7ba3d67a3cfb4baea0693d /saga/interface.cpp | |
parent | 8585d77d34317412dbacbac058d704b98b8a0a78 (diff) | |
download | scummvm-rg350-fe1ab79beeec83d156572c12a8f3e1cb874d7d7d.tar.gz scummvm-rg350-fe1ab79beeec83d156572c12a8f3e1cb874d7d7d.tar.bz2 scummvm-rg350-fe1ab79beeec83d156572c12a8f3e1cb874d7d7d.zip |
Move FONT_* to class.
svn-id: r14449
Diffstat (limited to 'saga/interface.cpp')
-rw-r--r-- | saga/interface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/saga/interface.cpp b/saga/interface.cpp index d15485f5d1..a175a94081 100644 --- a/saga/interface.cpp +++ b/saga/interface.cpp @@ -29,7 +29,7 @@ #include "saga/cvar_mod.h" #include "saga/actor.h" #include "saga/console_mod.h" -#include "saga/font_mod.h" +#include "saga/font.h" #include "saga/objectmap.h" #include "saga/rscfile_mod.h" #include "saga/script_mod.h" @@ -359,9 +359,9 @@ int DrawStatusBar(R_SURFACE *ds) { _vm->_gfx->drawRect(ds, &rect, IfModule.i_desc.status_bgcol); - string_w = FONT_GetStringWidth(SMALL_FONT_ID, IfModule.status_txt, 0, 0); + string_w = _vm->_font->getStringWidth(SMALL_FONT_ID, IfModule.status_txt, 0, 0); - FONT_Draw(SMALL_FONT_ID, ds, IfModule.status_txt, 0, (IfModule.i_desc.status_w / 2) - (string_w / 2), + _vm->_font->draw(SMALL_FONT_ID, ds, IfModule.status_txt, 0, (IfModule.i_desc.status_w / 2) - (string_w / 2), IfModule.i_desc.status_y + IfModule.i_desc.status_txt_y, IfModule.i_desc.status_txt_col, 0, 0); return R_SUCCESS; @@ -448,7 +448,7 @@ int HandleCommandUpdate(R_SURFACE *ds, R_POINT *imouse_pt) { verb_idx = IfModule.c_panel.buttons[i].data; - string_w = FONT_GetStringWidth(SMALL_FONT_ID, I_VerbData[verb_idx].verb_str, 0, 0); + string_w = _vm->_font->getStringWidth(SMALL_FONT_ID, I_VerbData[verb_idx].verb_str, 0, 0); if (i == hit_button) { color = IfModule.i_desc.cmd_txt_hilitecol; @@ -459,7 +459,7 @@ int HandleCommandUpdate(R_SURFACE *ds, R_POINT *imouse_pt) { button_x = IfModule.c_panel.x + IfModule.c_panel.buttons[i].x1; button_y = IfModule.c_panel.y + IfModule.c_panel.buttons[i].y1; - FONT_Draw(SMALL_FONT_ID, ds, I_VerbData[verb_idx].verb_str, 0, + _vm->_font->draw(SMALL_FONT_ID, ds, I_VerbData[verb_idx].verb_str, 0, button_x + ((button_w / 2) - (string_w / 2)), button_y + 1, color, IfModule.i_desc.cmd_txt_shadowcol, FONT_SHADOW); |