diff options
Diffstat (limited to 'src/mame/video/gaplus.c')
-rw-r--r-- | src/mame/video/gaplus.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c index 7a611c50bbf..f6f6a05bd15 100644 --- a/src/mame/video/gaplus.c +++ b/src/mame/video/gaplus.c @@ -23,14 +23,11 @@ ***************************************************************************/ -void gaplus_state::palette_init() +PALETTE_INIT_MEMBER(gaplus_state, gaplus) { const UINT8 *color_prom = memregion("proms")->base(); int i; - /* allocate the colortable */ - machine().colortable = colortable_alloc(machine(), 256); - for (i = 0;i < 256;i++) { int bit0,bit1,bit2,bit3,r,g,b; @@ -54,7 +51,7 @@ void gaplus_state::palette_init() bit3 = (color_prom[i + 0x200] >> 3) & 0x01; b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; - colortable_palette_set_color(machine().colortable,i,rgb_t(r,g,b)); + palette.set_indirect_color(i,rgb_t(r,g,b)); } color_prom += 0x300; @@ -62,12 +59,12 @@ void gaplus_state::palette_init() /* characters use colors 0xf0-0xff */ for (i = 0;i < m_gfxdecode->gfx(0)->colors() * m_gfxdecode->gfx(0)->granularity();i++) - colortable_entry_set_value(machine().colortable, m_gfxdecode->gfx(0)->colorbase() + i, 0xf0 + (*color_prom++ & 0x0f)); + palette.set_pen_indirect(m_gfxdecode->gfx(0)->colorbase() + i, 0xf0 + (*color_prom++ & 0x0f)); /* sprites */ for (i = 0;i < m_gfxdecode->gfx(1)->colors() * m_gfxdecode->gfx(1)->granularity();i++) { - colortable_entry_set_value(machine().colortable, m_gfxdecode->gfx(1)->colorbase() + i, (color_prom[0] & 0x0f) + ((color_prom[0x200] & 0x0f) << 4)); + palette.set_pen_indirect(m_gfxdecode->gfx(1)->colorbase() + i, (color_prom[0] & 0x0f) + ((color_prom[0x200] & 0x0f) << 4)); color_prom++; } } @@ -182,7 +179,7 @@ void gaplus_state::video_start() { m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gaplus_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(gaplus_state::tilemap_scan),this),8,8,36,28); - colortable_configure_tilemap_groups(machine().colortable, m_bg_tilemap, m_gfxdecode->gfx(0), 0xff); + m_palette->configure_tilemap_groups(*m_bg_tilemap, *m_gfxdecode->gfx(0), 0xff); starfield_init(); } @@ -288,12 +285,12 @@ void gaplus_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 + (duplicate ? 0 : (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, 0xff)); + m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, 0xff)); } } } |