diff options
Diffstat (limited to 'src/mame/video/galaga.c')
-rw-r--r-- | src/mame/video/galaga.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c index ad733e52e0a..45ff75bc644 100644 --- a/src/mame/video/galaga.c +++ b/src/mame/video/galaga.c @@ -328,8 +328,6 @@ PALETTE_INIT_MEMBER(galaga_state,galaga) const UINT8 *color_prom = memregion("proms")->base(); int i; - machine().colortable = colortable_alloc(machine(), 32+64); - /* core palette */ for (i = 0;i < 32;i++) { @@ -348,7 +346,7 @@ PALETTE_INIT_MEMBER(galaga_state,galaga) bit2 = ((*color_prom) >> 7) & 0x01; b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - colortable_palette_set_color(machine().colortable,i,rgb_t(r,g,b)); + palette.set_indirect_color(i,rgb_t(r,g,b)); color_prom++; } @@ -365,20 +363,20 @@ PALETTE_INIT_MEMBER(galaga_state,galaga) bits = (i >> 4) & 0x03; b = map[bits]; - colortable_palette_set_color(machine().colortable,32 + i,rgb_t(r,g,b)); + palette.set_indirect_color(32 + i,rgb_t(r,g,b)); } /* characters */ for (i = 0;i < 64*4;i++) - colortable_entry_set_value(machine().colortable, i, (*(color_prom++) & 0x0f) + 0x10); /* chars */ + palette.set_pen_indirect(i, (*(color_prom++) & 0x0f) + 0x10); /* chars */ /* sprites */ for (i = 0;i < 64*4;i++) - colortable_entry_set_value(machine().colortable, 64*4+i, (*(color_prom++) & 0x0f)); + palette.set_pen_indirect(64*4+i, (*(color_prom++) & 0x0f)); /* now the stars */ for (i = 0;i < 64;i++) - colortable_entry_set_value(machine().colortable, 64*4+64*4+i, 32 + i); + palette.set_pen_indirect(64*4+64*4+i, 32 + i); } @@ -432,7 +430,7 @@ TILE_GET_INFO_MEMBER(galaga_state::get_tile_info) VIDEO_START_MEMBER(galaga_state,galaga) { m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaga_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(galaga_state::tilemap_scan),this),8,8,36,28); - colortable_configure_tilemap_groups(machine().colortable, m_fg_tilemap, m_gfxdecode->gfx(0), 0x1f); + m_palette->configure_tilemap_groups(*m_fg_tilemap, *m_gfxdecode->gfx(0), 0x1f); m_galaga_gfxbank = 0; @@ -508,12 +506,12 @@ void galaga_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect { for (x = 0;x <= sizex;x++) { - m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, sprite + gfx_offs[y ^ (sizey * flipy)][x ^ (sizex * flipx)], color, flipx,flipy, sx + 16*x, sy + 16*y, - colortable_get_transpen_mask(machine().colortable, m_gfxdecode->gfx(1), color, 0x0f)); + m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, 0x0f)); } } } @@ -554,7 +552,7 @@ void galaga_state::draw_stars(bitmap_ind16 &bitmap, const rectangle &cliprect ) UINT32 galaga_state::screen_update_galaga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); + bitmap.fill(m_palette->black_pen(), cliprect); draw_stars(bitmap,cliprect); draw_sprites(bitmap,cliprect); m_fg_tilemap->draw(screen, bitmap, cliprect, 0,0); |