diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/flyball.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/flyball.cpp')
-rw-r--r-- | src/mame/drivers/flyball.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp index ac8ef621f9b..992fd3f8752 100644 --- a/src/mame/drivers/flyball.cpp +++ b/src/mame/drivers/flyball.cpp @@ -459,11 +459,11 @@ void flyball_state::machine_reset() } -void flyball_state::flyball(machine_config &config) -{ +MACHINE_CONFIG_START(flyball_state::flyball) + /* basic machine hardware */ - M6502(config, m_maincpu, MASTER_CLOCK/16); - m_maincpu->set_addrmap(AS_PROGRAM, &flyball_state::flyball_map); + MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/16) + MCFG_DEVICE_PROGRAM_MAP(flyball_map) F9334(config, m_outlatch); // F7 m_outlatch->q_out_cb<2>().set_nop(); // bat hit @@ -474,19 +474,19 @@ void flyball_state::flyball(machine_config &config) m_outlatch->q_out_cb<7>().set(FUNC(flyball_state::lamp_w)); // 1 player lamp /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_size(256, 262); - m_screen->set_visarea(0, 255, 0, 239); - m_screen->set_screen_update(FUNC(flyball_state::screen_update)); - m_screen->set_palette(m_palette); - m_screen->screen_vblank().set_inputline(m_maincpu, INPUT_LINE_NMI); - - GFXDECODE(config, m_gfxdecode, m_palette, gfx_flyball); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_SIZE(256, 262) + MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) + MCFG_SCREEN_UPDATE_DRIVER(flyball_state, screen_update) + MCFG_SCREEN_PALETTE(m_palette) + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) + + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_palette, gfx_flyball) PALETTE(config, m_palette, FUNC(flyball_state::flyball_palette), 4); /* sound hardware */ -} +MACHINE_CONFIG_END /************************************* |