diff options
| author | Jonathan Gray | 2004-08-01 11:48:53 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2004-08-01 11:48:53 +0000 |
| commit | 0bbeb61f5e74437c2105b0aff042caeacb34bc8d (patch) | |
| tree | 06ac67ffe6081cab4d93ba37bcda2b361575bdf7 /saga/console.cpp | |
| parent | 12e1c4711bc9a4e56096a6a7ab38c3146eccd35d (diff) | |
| download | scummvm-rg350-0bbeb61f5e74437c2105b0aff042caeacb34bc8d.tar.gz scummvm-rg350-0bbeb61f5e74437c2105b0aff042caeacb34bc8d.tar.bz2 scummvm-rg350-0bbeb61f5e74437c2105b0aff042caeacb34bc8d.zip | |
merge gfx_mod.h into gfx.h and stick functions into a class
svn-id: r14419
Diffstat (limited to 'saga/console.cpp')
| -rw-r--r-- | saga/console.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/saga/console.cpp b/saga/console.cpp index 34fae3a494..488d50aa63 100644 --- a/saga/console.cpp +++ b/saga/console.cpp @@ -24,11 +24,10 @@ // Console module #include "saga.h" -#include "gfx_mod.h" +#include "gfx.h" #include "font_mod.h" #include "cvar_mod.h" #include "events_mod.h" -#include "gfx_mod.h" #include "console_mod.h" #include "console.h" @@ -216,9 +215,9 @@ int CON_Draw(R_SURFACE *ds) { fill_rect.bottom = ConInfo.y_pos; fill_rect.right = ds->buf_w - 1; - GFX_DrawRect(ds, &fill_rect, GFX_MatchColor(R_CONSOLE_BGCOLOR)); - txt_fgcolor = GFX_MatchColor(R_CONSOLE_TXTCOLOR); - txt_shcolor = GFX_MatchColor(R_CONSOLE_TXTSHADOW); + _vm->_gfx->drawRect(ds, &fill_rect, _vm->_gfx->matchColor(R_CONSOLE_BGCOLOR)); + txt_fgcolor = _vm->_gfx->matchColor(R_CONSOLE_TXTCOLOR); + txt_shcolor = _vm->_gfx->matchColor(R_CONSOLE_TXTSHADOW); FONT_Draw(SMALL_FONT_ID, ds, ">", 1, 2, ConInfo.y_pos - 10, txt_fgcolor, txt_shcolor, FONT_SHADOW); FONT_Draw(SMALL_FONT_ID, ds, ConInfo.input_buf, strlen(ConInfo.input_buf), @@ -353,7 +352,7 @@ int CON_DropConsole(double percent) { percent = 1.0; } - back_buf = GFX_GetBackBuffer(); + back_buf = _vm->_gfx->getBackBuffer(); CON_SetDropPos(percent); CON_Draw(back_buf); @@ -368,7 +367,7 @@ int CON_RaiseConsole(double percent) { ConInfo.active = 0; } - back_buf = GFX_GetBackBuffer(); + back_buf = _vm->_gfx->getBackBuffer(); CON_SetDropPos(1.0 - percent); CON_Draw(back_buf); |