diff options
| author | Filippos Karapetis | 2009-09-09 08:19:16 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-09 08:19:16 +0000 |
| commit | 5cd538a1b3026513d7b1ee924337c6603fc6a52b (patch) | |
| tree | e97f1233c64f0e35f7348bb43196ad0687f2b5c1 /engines/sci/gfx/operations.cpp | |
| parent | f73c5561467c5c3b83663d7765050960d67e54fe (diff) | |
| download | scummvm-rg350-5cd538a1b3026513d7b1ee924337c6603fc6a52b.tar.gz scummvm-rg350-5cd538a1b3026513d7b1ee924337c6603fc6a52b.tar.bz2 scummvm-rg350-5cd538a1b3026513d7b1ee924337c6603fc6a52b.zip | |
Removed/replaced the gfx_pixmap_color struct
svn-id: r44017
Diffstat (limited to 'engines/sci/gfx/operations.cpp')
| -rw-r--r-- | engines/sci/gfx/operations.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index 0e655424a7..ba07071a8a 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -49,14 +49,15 @@ namespace Sci { // Default color maps #define DEFAULT_COLORS_NR 16 -gfx_pixmap_color_t default_colors[DEFAULT_COLORS_NR] = {{GFX_COLOR_SYSTEM, 0x00, 0x00, 0x00}, {GFX_COLOR_SYSTEM, 0x00, 0x00, 0xaa}, - {GFX_COLOR_SYSTEM, 0x00, 0xaa, 0x00}, {GFX_COLOR_SYSTEM, 0x00, 0xaa, 0xaa}, - {GFX_COLOR_SYSTEM, 0xaa, 0x00, 0x00}, {GFX_COLOR_SYSTEM, 0xaa, 0x00, 0xaa}, - {GFX_COLOR_SYSTEM, 0xaa, 0x55, 0x00}, {GFX_COLOR_SYSTEM, 0xaa, 0xaa, 0xaa}, - {GFX_COLOR_SYSTEM, 0x55, 0x55, 0x55}, {GFX_COLOR_SYSTEM, 0x55, 0x55, 0xff}, - {GFX_COLOR_SYSTEM, 0x55, 0xff, 0x55}, {GFX_COLOR_SYSTEM, 0x55, 0xff, 0xff}, - {GFX_COLOR_SYSTEM, 0xff, 0x55, 0x55}, {GFX_COLOR_SYSTEM, 0xff, 0x55, 0xff}, - {GFX_COLOR_SYSTEM, 0xff, 0xff, 0x55}, {GFX_COLOR_SYSTEM, 0xff, 0xff, 0xff} +PaletteEntry default_colors[DEFAULT_COLORS_NR] = { + PaletteEntry(0x00, 0x00, 0x00), PaletteEntry(0x00, 0x00, 0xaa), + PaletteEntry(0x00, 0xaa, 0x00), PaletteEntry(0x00, 0xaa, 0xaa), + PaletteEntry(0xaa, 0x00, 0x00), PaletteEntry(0xaa, 0x00, 0xaa), + PaletteEntry(0xaa, 0x55, 0x00), PaletteEntry(0xaa, 0xaa, 0xaa), + PaletteEntry(0x55, 0x55, 0x55), PaletteEntry(0x55, 0x55, 0xff), + PaletteEntry(0x55, 0xff, 0x55), PaletteEntry(0x55, 0xff, 0xff), + PaletteEntry(0xff, 0x55, 0x55), PaletteEntry(0xff, 0x55, 0xff), + PaletteEntry(0xff, 0xff, 0x55), PaletteEntry(0xff, 0xff, 0xff) }; // "Normal" EGA #define POINTER_VISIBLE_BUT_CLIPPED 2 @@ -775,7 +776,7 @@ void gfxop_draw_line(GfxState *state, Common::Point start, Common::Point end, end.y += yfact >> 1; } - if (color.visual.parent_index == GFX_COLOR_INDEX_UNMAPPED) + if (color.visual.parent_index == -1) gfxop_set_color(state, &color, color); _gfxop_draw_line_clipped(state, start, end, color, line_mode, line_style); } @@ -893,7 +894,7 @@ void gfxop_draw_box(GfxState *state, rect_t box, gfx_color_t color1, gfx_color_t if (shade_type == GFX_BOX_SHADE_FLAT) { color1.priority = 0; color1.control = 0; - if (color1.visual.parent_index == GFX_COLOR_INDEX_UNMAPPED) + if (color1.visual.parent_index == -1) gfxop_set_color(state, &color1, color1); drv->drawFilledRect(new_box, color1, color1, GFX_SHADE_FLAT); return; |