From 219e664785890f52079bae7e74543920d638796a Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 13 Sep 2012 11:15:32 +0000 Subject: Massive change, MACHINE_START\RESET, VIDEO_START\RESET and PALETTE_INIT changed to be members of state classes (no whatsnew) --- src/mame/drivers/fcombat.c | 50 ++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) (limited to 'src/mame/drivers/fcombat.c') diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c index ed2ffe9c24d..e7890604b7a 100644 --- a/src/mame/drivers/fcombat.c +++ b/src/mame/drivers/fcombat.c @@ -257,34 +257,32 @@ GFXDECODE_END * *************************************/ -static MACHINE_START( fcombat ) +void fcombat_state::machine_start() { - fcombat_state *state = machine.driver_data(); - - state->m_maincpu = machine.device("maincpu"); - - state->save_item(NAME(state->m_cocktail_flip)); - state->save_item(NAME(state->m_char_palette)); - state->save_item(NAME(state->m_sprite_palette)); - state->save_item(NAME(state->m_char_bank)); - state->save_item(NAME(state->m_fcombat_sh)); - state->save_item(NAME(state->m_fcombat_sv)); - state->save_item(NAME(state->m_tx)); - state->save_item(NAME(state->m_ty)); + + m_maincpu = machine().device("maincpu"); + + save_item(NAME(m_cocktail_flip)); + save_item(NAME(m_char_palette)); + save_item(NAME(m_sprite_palette)); + save_item(NAME(m_char_bank)); + save_item(NAME(m_fcombat_sh)); + save_item(NAME(m_fcombat_sv)); + save_item(NAME(m_tx)); + save_item(NAME(m_ty)); } -static MACHINE_RESET( fcombat ) +void fcombat_state::machine_reset() { - fcombat_state *state = machine.driver_data(); - - state->m_cocktail_flip = 0; - state->m_char_palette = 0; - state->m_sprite_palette = 0; - state->m_char_bank = 0; - state->m_fcombat_sh = 0; - state->m_fcombat_sv = 0; - state->m_tx = 0; - state->m_ty = 0; + + m_cocktail_flip = 0; + m_char_palette = 0; + m_sprite_palette = 0; + m_char_bank = 0; + m_fcombat_sh = 0; + m_fcombat_sv = 0; + m_tx = 0; + m_ty = 0; } static MACHINE_CONFIG_START( fcombat, fcombat_state ) @@ -296,8 +294,6 @@ static MACHINE_CONFIG_START( fcombat, fcombat_state ) MCFG_CPU_ADD("audiocpu", Z80, 10000000/3) MCFG_CPU_PROGRAM_MAP(audio_map) - MCFG_MACHINE_START(fcombat) - MCFG_MACHINE_RESET(fcombat) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -307,8 +303,6 @@ static MACHINE_CONFIG_START( fcombat, fcombat_state ) MCFG_GFXDECODE(fcombat) MCFG_PALETTE_LENGTH(256*3) - MCFG_PALETTE_INIT(fcombat) - MCFG_VIDEO_START(fcombat) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") -- cgit v1.2.3