diff options
Diffstat (limited to 'src/mame/drivers/jollyjgr.c')
-rw-r--r-- | src/mame/drivers/jollyjgr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index fbd95f0e5c6..7798cf081f3 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -140,7 +140,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); - virtual void palette_init(); + DECLARE_PALETTE_INIT(jollyjgr); UINT32 screen_update_jollyjgr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_fspider(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jollyjgr_interrupt); @@ -411,7 +411,7 @@ INPUT_PORTS_END * *************************************/ -void jollyjgr_state::palette_init() +PALETTE_INIT_MEMBER(jollyjgr_state, jollyjgr) { const UINT8 *color_prom = memregion("proms")->base(); int i; @@ -436,13 +436,13 @@ void jollyjgr_state::palette_init() bit1 = BIT(*color_prom, 7); b = 0x4f * bit0 + 0xa8 * bit1; - palette_set_color(machine(), i, rgb_t(r,g,b)); + palette.set_pen_color(i, rgb_t(r,g,b)); color_prom++; } /* bitmap palette */ for (i = 0;i < 8;i++) - palette_set_color_rgb(machine(), 32 + i, pal1bit(i >> 0), pal1bit(i >> 1), pal1bit(i >> 2)); + palette.set_pen_color(32 + i, pal1bit(i >> 0), pal1bit(i >> 1), pal1bit(i >> 2)); } /* Tilemap is the same as in Galaxian */ @@ -543,7 +543,7 @@ UINT32 jollyjgr_state::screen_update_jollyjgr(screen_device &screen, bitmap_ind1 if (offs < 3 * 4) sy++; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, code,color, flipx,flipy, sx,sy,0); @@ -665,8 +665,8 @@ static MACHINE_CONFIG_START( jollyjgr, jollyjgr_state ) MCFG_SCREEN_UPDATE_DRIVER(jollyjgr_state, screen_update_jollyjgr) MCFG_GFXDECODE_ADD("gfxdecode", jollyjgr) - MCFG_PALETTE_LENGTH(32+8) /* 32 for tilemap and sprites + 8 for the bitmap */ - + MCFG_PALETTE_ADD("palette", 32+8) /* 32 for tilemap and sprites + 8 for the bitmap */ + MCFG_PALETTE_INIT_OWNER(jollyjgr_state, jollyjgr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") |