diff options
| author | Willem Jan Palenstijn | 2009-03-08 20:17:01 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-03-08 20:17:01 +0000 |
| commit | ced40b2266976d0129294a1c5925b7d88024b2de (patch) | |
| tree | 61b4339e05c997d91a3491aaeac2a978e86e9997 /engines/sci/gfx/sci_widgets.cpp | |
| parent | 85f6f204195c0859ecf4119e63d5f53b91fb5684 (diff) | |
| download | scummvm-rg350-ced40b2266976d0129294a1c5925b7d88024b2de.tar.gz scummvm-rg350-ced40b2266976d0129294a1c5925b7d88024b2de.tar.bz2 scummvm-rg350-ced40b2266976d0129294a1c5925b7d88024b2de.zip | |
Use new Palette class to manager pixmap palettes.
There are some remaining regressions with text colour in SCI1 games,
but overall it should fix more than it breaks.
svn-id: r39242
Diffstat (limited to 'engines/sci/gfx/sci_widgets.cpp')
| -rw-r--r-- | engines/sci/gfx/sci_widgets.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/gfx/sci_widgets.cpp b/engines/sci/gfx/sci_widgets.cpp index 3e6329d426..2509383b89 100644 --- a/engines/sci/gfx/sci_widgets.cpp +++ b/engines/sci/gfx/sci_widgets.cpp @@ -135,7 +135,8 @@ gfxw_port_t *sciw_new_window(EngineState *s, rect_t area, int font, gfx_color_t gfx_state_t *state = s->gfx_state; int shadow_offset = 2; rect_t frame; - gfx_color_t black = {{0, 0, 0, 0}, 0, 0, 0, 0}; + gfx_color_t black; + gfxop_set_color(state, &black, 0, 0, 0, 0, 0, 0); gfxw_port_t *win; gfxw_list_t *decorations; // int xextra = !(flags & WINDOW_FLAG_NOFRAME) ? 1 : 0; @@ -596,7 +597,7 @@ gfxw_widget_t *_make_menu_entry(menu_item_t *item, int offset, int width, gfxw_p rect_t area = gfx_rect(MENU_BOX_LEFT_PADDING, 0, width - MENU_BOX_LEFT_PADDING, 10); rect_t list_area = gfx_rect(port->zone.x, area.y + offset + port->zone.y, width, area.yl); gfxw_list_t *list = (gfxw_list_t *) gfxw_set_id(GFXW(gfxw_new_list(list_area, 0)), ID, GFXW_NO_ID); - gfx_color_t xcolor = {{0, 0, 0, 0}, 0, 0, 0, 0}; + gfx_color_t xcolor = { PaletteEntry(), 0, 0, 0, 0}; color = un_prioritize(color); bgcolor = un_prioritize(bgcolor); |