diff options
Diffstat (limited to 'src/mame/video/zodiack.c')
-rw-r--r-- | src/mame/video/zodiack.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index e4a5197b0fd..64d0b923531 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -47,9 +47,6 @@ PALETTE_INIT_MEMBER(zodiack_state,zodiack) const UINT8 *color_prom = memregion("proms")->base(); int i; - /* allocate the colortable */ - machine().colortable = colortable_alloc(machine(), 0x31); - /* create a lookup table for the palette */ for (i = 0; i < 0x30; i++) { @@ -74,25 +71,25 @@ PALETTE_INIT_MEMBER(zodiack_state,zodiack) bit2 = (color_prom[i] >> 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)); } /* white for bullets */ - colortable_palette_set_color(machine().colortable, 0x30, rgb_t::white); + palette.set_indirect_color(0x30, rgb_t::white); for (i = 0; i < 0x20; i++) if ((i & 3) == 0) - colortable_entry_set_value(machine().colortable, i, 0); + palette.set_pen_indirect(i, 0); for (i = 0; i < 0x10; i += 2) { - colortable_entry_set_value(machine().colortable, 0x20 + i, 32 + (i / 2)); - colortable_entry_set_value(machine().colortable, 0x21 + i, 40 + (i / 2)); + palette.set_pen_indirect(0x20 + i, 32 + (i / 2)); + palette.set_pen_indirect(0x21 + i, 40 + (i / 2)); } /* bullet */ - colortable_entry_set_value(machine().colortable, 0x30, 0); - colortable_entry_set_value(machine().colortable, 0x31, 0x30); + palette.set_pen_indirect(0x30, 0); + palette.set_pen_indirect(0x31, 0x30); } TILE_GET_INFO_MEMBER(zodiack_state::get_bg_tile_info) @@ -130,7 +127,7 @@ void zodiack_state::draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprec if (!(flip_screen() && m_percuss_hardware)) sy = 255 - sy; - m_gfxdecode->gfx(2)->transpen( + m_gfxdecode->gfx(2)->transpen(m_palette, bitmap, cliprect, 0, /* this is just a dot, generated by the hardware */ @@ -156,7 +153,7 @@ void zodiack_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, spritecode, m_spriteram[offs + 2] & 0x07, flipx, flipy, |