summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/naughtyb.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/naughtyb.c')
-rw-r--r--src/mame/video/naughtyb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/video/naughtyb.c b/src/mame/video/naughtyb.c
index 44c5341a7f1..087da342815 100644
--- a/src/mame/video/naughtyb.c
+++ b/src/mame/video/naughtyb.c
@@ -57,7 +57,7 @@ static const res_net_info naughtyb_net_info =
***************************************************************************/
-void naughtyb_state::palette_init()
+PALETTE_INIT_MEMBER(naughtyb_state, naughtyb)
{
const UINT8 *color_prom = memregion("proms")->base();
static const int resistances[2] = { 270, 130 };
@@ -70,7 +70,7 @@ void naughtyb_state::palette_init()
2, resistances, weights, 0, 0,
0, 0, 0, 0, 0);
- for (i = 0;i < machine().total_colors(); i++)
+ for (i = 0;i < palette.entries(); i++)
{
int bit0, bit1;
int r, g, b;
@@ -90,7 +90,7 @@ void naughtyb_state::palette_init()
bit1 = (color_prom[i+0x100] >> 1) & 0x01;
b = combine_2_weights(weights, bit0, bit1);
- palette_set_color(machine(), BITSWAP8(i,5,7,6,2,1,0,4,3), rgb_t(r, g, b));
+ palette.set_pen_color(BITSWAP8(i,5,7,6,2,1,0,4,3), rgb_t(r, g, b));
}
}
@@ -224,13 +224,13 @@ UINT32 naughtyb_state::screen_update_naughtyb(screen_device &screen, bitmap_ind1
}
}
- m_gfxdecode->gfx(0)->opaque(tmpbitmap,tmpbitmap.cliprect(),
+ m_gfxdecode->gfx(0)->opaque(m_palette,tmpbitmap,tmpbitmap.cliprect(),
m_videoram2[offs] + 256 * m_bankreg,
(m_videoram2[offs] >> 5) + 8 * m_palreg,
m_cocktail,m_cocktail,
8*sx,8*sy);
- m_gfxdecode->gfx(1)->transpen(tmpbitmap,tmpbitmap.cliprect(),
+ m_gfxdecode->gfx(1)->transpen(m_palette,tmpbitmap,tmpbitmap.cliprect(),
videoram[offs] + 256*m_bankreg,
(videoram[offs] >> 5) + 8 * m_palreg,
m_cocktail,m_cocktail,