diff options
| author | Eugene Sandulenko | 2004-08-03 01:07:34 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2004-08-03 01:07:34 +0000 |
| commit | b197c3dac8e9872f188ffea80c069f4862e64fe0 (patch) | |
| tree | 586b3c55ec21f355dee75b1feea2bc6d0669378c /saga/interface.cpp | |
| parent | 415400f24e4041298ebd2b084f8fa4a32ea4e7c7 (diff) | |
| download | scummvm-rg350-b197c3dac8e9872f188ffea80c069f4862e64fe0.tar.gz scummvm-rg350-b197c3dac8e9872f188ffea80c069f4862e64fe0.tar.bz2 scummvm-rg350-b197c3dac8e9872f188ffea80c069f4862e64fe0.zip | |
Move SPRITE_ to a class
svn-id: r14451
Diffstat (limited to 'saga/interface.cpp')
| -rw-r--r-- | saga/interface.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/saga/interface.cpp b/saga/interface.cpp index a175a94081..5fb8b2a7ea 100644 --- a/saga/interface.cpp +++ b/saga/interface.cpp @@ -33,7 +33,7 @@ #include "saga/objectmap.h" #include "saga/rscfile_mod.h" #include "saga/script_mod.h" -#include "saga/sprite_mod.h" +#include "saga/sprite.h" #include "saga/interface_mod.h" #include "saga/interface.h" @@ -191,9 +191,9 @@ int INTERFACE_Init(void) { return R_FAILURE; } - SPRITE_LoadList(ITE_COMMAND_BUTTONSPRITES, &IfModule.c_panel.sprites); + _vm->_sprite->loadList(ITE_COMMAND_BUTTONSPRITES, &IfModule.c_panel.sprites); - SPRITE_LoadList(ITE_DEFAULT_PORTRAITS, &IfModule.def_portraits); + _vm->_sprite->loadList(ITE_DEFAULT_PORTRAITS, &IfModule.def_portraits); _vm->decodeBGImage(IfModule.c_panel.res, IfModule.c_panel.res_len, &IfModule.c_panel.img, &IfModule.c_panel.img_len, &IfModule.c_panel.img_w, &IfModule.c_panel.img_h); @@ -294,7 +294,7 @@ int INTERFACE_Draw() { lportrait_x = xbase + IfModule.i_desc.lportrait_x; lportrait_y = ybase + IfModule.i_desc.lportrait_y; - SPRITE_Draw(back_buf, IfModule.def_portraits, IfModule.active_portrait, lportrait_x, lportrait_y); + _vm->_sprite->draw(back_buf, IfModule.def_portraits, IfModule.active_portrait, lportrait_x, lportrait_y); return R_SUCCESS; } @@ -402,7 +402,7 @@ int HandleCommandClick(R_SURFACE *ds, R_POINT *imouse_pt) { button_x = x_base + IfModule.c_panel.buttons[set_button].x1; button_y = y_base + IfModule.c_panel.buttons[set_button].y1; - SPRITE_Draw(ds, IfModule.c_panel.sprites, IfModule.c_panel.buttons[set_button]. + _vm->_sprite->draw(ds, IfModule.c_panel.sprites, IfModule.c_panel.buttons[set_button]. active_sprite - 1, button_x, button_y); } @@ -410,7 +410,7 @@ int HandleCommandClick(R_SURFACE *ds, R_POINT *imouse_pt) { button_x = x_base + IfModule.c_panel.buttons[old_set_button].x1; button_y = y_base + IfModule.c_panel.buttons[old_set_button].y1; - SPRITE_Draw(ds, IfModule.c_panel.sprites, IfModule.c_panel.buttons[old_set_button]. + _vm->_sprite->draw(ds, IfModule.c_panel.sprites, IfModule.c_panel.buttons[old_set_button]. inactive_sprite - 1, button_x, button_y); } } @@ -464,7 +464,7 @@ int HandleCommandUpdate(R_SURFACE *ds, R_POINT *imouse_pt) { color, IfModule.i_desc.cmd_txt_shadowcol, FONT_SHADOW); if ((i == IfModule.c_panel.set_button) && (IfModule.c_panel.buttons[i].flags & BUTTON_BITMAP)) { - SPRITE_Draw(ds, IfModule.c_panel.sprites, IfModule.c_panel.buttons[i].active_sprite - 1, + _vm->_sprite->draw(ds, IfModule.c_panel.sprites, IfModule.c_panel.buttons[i].active_sprite - 1, button_x, button_y); } } |