diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2014-02-27 13:35:15 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2014-02-27 13:35:15 +0000 |
commit | 64ac8f6776fc4451d756b0eb3bb6dbd22c49801a (patch) | |
tree | bb1d096fecec4684c8ab2b7be1b4d539ca06e57b /src/mame/drivers/flipjack.c | |
parent | f9d3fbaa73ccdab2e5fcf9fc095a14b4f24c3133 (diff) |
Huge update, palette is now device (nw)
note: Aaron please give more descriptive text for release log I have no more strength :)
Diffstat (limited to 'src/mame/drivers/flipjack.c')
-rw-r--r-- | src/mame/drivers/flipjack.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/mame/drivers/flipjack.c b/src/mame/drivers/flipjack.c index cf9ad949fee..5d69522a933 100644 --- a/src/mame/drivers/flipjack.c +++ b/src/mame/drivers/flipjack.c @@ -126,7 +126,7 @@ public: DECLARE_READ8_MEMBER(flipjack_soundlatch_r); DECLARE_WRITE8_MEMBER(flipjack_portc_w); virtual void machine_start(); - virtual void palette_init(); + DECLARE_PALETTE_INIT(flipjack); UINT32 screen_update_flipjack(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -137,19 +137,19 @@ public: ***************************************************************************/ -void flipjack_state::palette_init() +PALETTE_INIT_MEMBER(flipjack_state, flipjack) { // from prom const UINT8 *color_prom = memregion("proms")->base(); for (int i = 0; i < 0x40; i++) { - palette_set_color_rgb(machine(), 2*i+1, pal1bit(i >> 1), pal1bit(i >> 2), pal1bit(i >> 0)); - palette_set_color_rgb(machine(), 2*i+0, pal1bit(color_prom[i] >> 1), pal1bit(color_prom[i] >> 2), pal1bit(color_prom[i] >> 0)); + palette.set_pen_color(2*i+1, pal1bit(i >> 1), pal1bit(i >> 2), pal1bit(i >> 0)); + palette.set_pen_color(2*i+0, pal1bit(color_prom[i] >> 1), pal1bit(color_prom[i] >> 2), pal1bit(color_prom[i] >> 0)); } // standard 3bpp for blitter for (int i = 0; i < 8; i++) - palette_set_color_rgb(machine(), i+0x80, pal1bit(i >> 1), pal1bit(i >> 2), pal1bit(i >> 0)); + palette.set_pen_color(i+0x80, pal1bit(i >> 1), pal1bit(i >> 2), pal1bit(i >> 0)); } @@ -157,7 +157,7 @@ UINT32 flipjack_state::screen_update_flipjack(screen_device &screen, bitmap_rgb3 { int x,y,count; - bitmap.fill(get_black_pen(machine()), cliprect); + bitmap.fill(m_palette->black_pen(), cliprect); // draw playfield if (m_layer & 2) @@ -184,7 +184,7 @@ UINT32 flipjack_state::screen_update_flipjack(screen_device &screen, bitmap_rgb3 color = ((pen_r >> (7-xi)) & 1)<<0; color|= ((pen_g >> (7-xi)) & 1)<<1; color|= ((pen_b >> (7-xi)) & 1)<<2; - bitmap.pix32(y, x+xi) = machine().pens[color+0x80]; + bitmap.pix32(y, x+xi) = m_palette->pen(color+0x80); } } @@ -202,7 +202,7 @@ UINT32 flipjack_state::screen_update_flipjack(screen_device &screen, bitmap_rgb3 int tile = m_bank << 8 | m_vram[x+y*0x100]; int color = m_cram[x+y*0x100] & 0x3f; - gfx->transpen(bitmap,cliprect, tile, color, 0, 0, x*8, y*8, 0); + gfx->transpen(m_palette,bitmap,cliprect, tile, color, 0, 0, x*8, y*8, 0); } } @@ -226,7 +226,7 @@ UINT32 flipjack_state::screen_update_flipjack(screen_device &screen, bitmap_rgb3 { color = ((pen >> (7-xi)) & 1) ? 0x87 : 0; if(color) - bitmap.pix32(y, x+xi) = machine().pens[color]; + bitmap.pix32(y, x+xi) = m_palette->pen(color); } } @@ -503,7 +503,8 @@ static MACHINE_CONFIG_START( flipjack, flipjack_state ) MCFG_GFXDECODE_ADD("gfxdecode", flipjack) - MCFG_PALETTE_LENGTH(128+8) + MCFG_PALETTE_ADD("palette", 128+8) + MCFG_PALETTE_INIT_OWNER(flipjack_state, flipjack) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") |