diff options
author | Vas Crabb <vas@vastheman.com> | 2018-05-16 21:56:39 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-05-16 21:56:39 +1000 |
commit | 166638ce8093e04884166296469bda82882890fd (patch) | |
tree | 6dedcf3bde5d05843695efaf4949ab285d3193f1 /src/mame/drivers/ambush.cpp | |
parent | 8e796a2075415427491a541b75884aea6e21f6a9 (diff) |
Revert "- Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much"
This reverts commit c83e2a853d4e1643fcc85b68ada3c6f7f33adea4.
Revert "fix compile. (nw)"
This reverts commit a259ba3e366f442a22a9341755ff58163869860c.
GCC is being bad and allowing invalid C++ that other compilers reject.
Diffstat (limited to 'src/mame/drivers/ambush.cpp')
-rw-r--r-- | src/mame/drivers/ambush.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp index 700fa96ef28..051fd5bf2d6 100644 --- a/src/mame/drivers/ambush.cpp +++ b/src/mame/drivers/ambush.cpp @@ -87,9 +87,9 @@ public: DECLARE_WRITE_LINE_MEMBER(color_bank_1_w); DECLARE_WRITE_LINE_MEMBER(color_bank_2_w); - void machine_start_ambush() ATTR_COLD; - void machine_start_mariobl() ATTR_COLD; - void machine_start_dkong3abl() ATTR_COLD; + DECLARE_MACHINE_START(ambush); + DECLARE_MACHINE_START(mariobl); + DECLARE_MACHINE_START(dkong3abl); DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); @@ -637,7 +637,7 @@ void ambush_state::register_save_states() save_item(NAME(m_color_bank)); } -void ambush_state::machine_start_ambush() +MACHINE_START_MEMBER( ambush_state, ambush ) { register_save_states(); @@ -647,7 +647,7 @@ void ambush_state::machine_start_ambush() m_char_tilemap->set_scroll_cols(32); } -void ambush_state::machine_start_mariobl() +MACHINE_START_MEMBER( ambush_state, mariobl ) { register_save_states(); @@ -657,7 +657,7 @@ void ambush_state::machine_start_mariobl() m_gfxdecode->gfx(0)->set_granularity(8); } -void ambush_state::machine_start_dkong3abl() +MACHINE_START_MEMBER( ambush_state, dkong3abl ) { register_save_states(); @@ -704,7 +704,7 @@ MACHINE_CONFIG_START(ambush_state::ambush) MCFG_WATCHDOG_ADD("watchdog") - set_machine_start_cb(config, driver_callback_delegate(&machine_start_ambush, this)); + MCFG_MACHINE_START_OVERRIDE(ambush_state, ambush) // video hardware MCFG_SCREEN_ADD("screen", RASTER) @@ -740,7 +740,7 @@ MACHINE_CONFIG_START(ambush_state::mariobl) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ambush_state, coin_counter_1_w)) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, ambush_state, color_bank_1_w)) - set_machine_start_cb(config, driver_callback_delegate(&machine_start_mariobl, this)); + MCFG_MACHINE_START_OVERRIDE(ambush_state, mariobl) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(ambush_state, screen_update_bootleg) @@ -761,7 +761,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(ambush_state::dkong3abl) mariobl(config); - set_machine_start_cb(config, driver_callback_delegate(&machine_start_dkong3abl, this)); + MCFG_MACHINE_START_OVERRIDE(ambush_state, dkong3abl) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_dkong3abl) |