summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/jangou.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/jangou.c')
-rw-r--r--src/mame/drivers/jangou.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c
index 36683e97468..e1b7855c4db 100644
--- a/src/mame/drivers/jangou.c
+++ b/src/mame/drivers/jangou.c
@@ -93,7 +93,7 @@ public:
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
- virtual void palette_init();
+ DECLARE_PALETTE_INIT(jangou);
DECLARE_MACHINE_START(jngolady);
DECLARE_MACHINE_RESET(jngolady);
DECLARE_MACHINE_START(common);
@@ -113,7 +113,7 @@ public:
*************************************/
/* guess: use the same resistor values as Crazy Climber (needs checking on the real HW) */
-void jangou_state::palette_init()
+PALETTE_INIT_MEMBER(jangou_state, jangou)
{
const UINT8 *color_prom = memregion("proms")->base();
static const int resistances_rg[3] = { 1000, 470, 220 };
@@ -127,7 +127,7 @@ void jangou_state::palette_init()
2, resistances_b, weights_b, 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, bit2;
int r, g, b;
@@ -149,7 +149,7 @@ void jangou_state::palette_init()
bit1 = (color_prom[i] >> 7) & 0x01;
b = combine_2_weights(weights_b, bit0, bit1);
- palette_set_color(machine(), i, rgb_t(r, g, b));
+ palette.set_pen_color(i, rgb_t(r, g, b));
}
}
@@ -170,8 +170,8 @@ UINT32 jangou_state::screen_update_jangou(screen_device &screen, bitmap_ind16 &b
for (x = cliprect.min_x; x <= cliprect.max_x; x += 2)
{
UINT32 srcpix = *src++;
- *dst++ = machine().pens[srcpix & 0xf];
- *dst++ = machine().pens[(srcpix >> 4) & 0xf];
+ *dst++ = m_palette->pen(srcpix & 0xf);
+ *dst++ = m_palette->pen((srcpix >> 4) & 0xf);
}
}
@@ -997,8 +997,8 @@ static MACHINE_CONFIG_START( jangou, jangou_state )
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(jangou_state, screen_update_jangou)
- MCFG_PALETTE_LENGTH(32)
-
+ MCFG_PALETTE_ADD("palette", 32)
+ MCFG_PALETTE_INIT_OWNER(jangou_state, jangou)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")