summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/ettrivia.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/ettrivia.c')
-rw-r--r--src/mame/drivers/ettrivia.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index 6ca896618be..975b805a49b 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -61,7 +61,7 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_bg);
TILE_GET_INFO_MEMBER(get_tile_info_fg);
virtual void video_start();
- virtual void palette_init();
+ DECLARE_PALETTE_INIT(ettrivia);
UINT32 screen_update_ettrivia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(ettrivia_interrupt);
inline void get_tile_info(tile_data &tileinfo, int tile_index, UINT8 *vidram, int gfx_code);
@@ -221,7 +221,7 @@ TILE_GET_INFO_MEMBER(ettrivia_state::get_tile_info_fg)
get_tile_info(tileinfo, tile_index, m_fg_videoram, 1);
}
-void ettrivia_state::palette_init()
+PALETTE_INIT_MEMBER(ettrivia_state, ettrivia)
{
const UINT8 *color_prom = memregion("proms")->base();
static const int resistances[2] = { 270, 130 };
@@ -234,7 +234,7 @@ void ettrivia_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;
@@ -254,7 +254,7 @@ void ettrivia_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));
}
}
@@ -319,8 +319,8 @@ static MACHINE_CONFIG_START( ettrivia, ettrivia_state )
MCFG_SCREEN_UPDATE_DRIVER(ettrivia_state, screen_update_ettrivia)
MCFG_GFXDECODE_ADD("gfxdecode", ettrivia)
- MCFG_PALETTE_LENGTH(256)
-
+ MCFG_PALETTE_ADD("palette", 256)
+ MCFG_PALETTE_INIT_OWNER(ettrivia_state, ettrivia)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")