diff options
Diffstat (limited to 'src/mame/drivers/flipjack.c')
-rw-r--r-- | src/mame/drivers/flipjack.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/mame/drivers/flipjack.c b/src/mame/drivers/flipjack.c index 13cb952c585..5f2cbd92664 100644 --- a/src/mame/drivers/flipjack.c +++ b/src/mame/drivers/flipjack.c @@ -120,6 +120,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(flipjack_coin); DECLARE_READ8_MEMBER(flipjack_soundlatch_r); DECLARE_WRITE8_MEMBER(flipjack_portc_w); + virtual void machine_start(); + virtual void palette_init(); }; @@ -129,19 +131,19 @@ public: ***************************************************************************/ -PALETTE_INIT( flipjack ) +void flipjack_state::palette_init() { // from prom - const UINT8 *color_prom = machine.root_device().memregion("proms")->base(); + const UINT8 *color_prom = machine().root_device().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_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)); } // 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_color_rgb(machine(), i+0x80, pal1bit(i >> 1), pal1bit(i >> 2), pal1bit(i >> 0)); } @@ -458,16 +460,15 @@ GFXDECODE_END -static MACHINE_START( flipjack ) +void flipjack_state::machine_start() { - flipjack_state *state = machine.driver_data<flipjack_state>(); - UINT8 *ROM = machine.root_device().memregion("maincpu")->base(); - machine.root_device().membank("bank1")->configure_entries(0, 2, &ROM[0x10000], 0x2000); - state->membank("bank1")->set_entry(0); - - state->save_item(NAME(state->m_soundlatch)); - state->save_item(NAME(state->m_bank)); - state->save_item(NAME(state->m_layer)); + UINT8 *ROM = machine().root_device().memregion("maincpu")->base(); + machine().root_device().membank("bank1")->configure_entries(0, 2, &ROM[0x10000], 0x2000); + membank("bank1")->set_entry(0); + + save_item(NAME(m_soundlatch)); + save_item(NAME(m_bank)); + save_item(NAME(m_layer)); } @@ -486,7 +487,6 @@ static MACHINE_CONFIG_START( flipjack, flipjack_state ) MCFG_I8255A_ADD( "ppi8255", ppi8255_intf ) - MCFG_MACHINE_START(flipjack) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -498,7 +498,6 @@ static MACHINE_CONFIG_START( flipjack, flipjack_state ) MCFG_GFXDECODE(flipjack) MCFG_PALETTE_LENGTH(128+8) - MCFG_PALETTE_INIT(flipjack) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") |