diff options
author | Vas Crabb <vas@vastheman.com> | 2018-02-14 22:40:47 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-02-14 23:46:17 +1100 |
commit | f4df51e5223578e206574234c0b8d1af300c3324 (patch) | |
tree | fd5c680c45baee30304a31723132444fe7359dfb /src/mame/drivers/gottlieb.cpp | |
parent | 1bd974c2b4f1f8815065efd4f5fcc0443ae15d28 (diff) |
(nw) screw you macros and the horse you rode in on
There's no voodoo involved in derived machine configurations and
fragments any more. The macros were just obfuscating things at this
point.
Diffstat (limited to 'src/mame/drivers/gottlieb.cpp')
-rw-r--r-- | src/mame/drivers/gottlieb.cpp | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index 5ca6c75369f..17da3a6cf63 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -1789,19 +1789,22 @@ MACHINE_CONFIG_START(gottlieb_state::gottlieb_core) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(gottlieb_state::gottlieb1, gottlieb_core) +MACHINE_CONFIG_START(gottlieb_state::gottlieb1) + gottlieb_core(config); MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(gottlieb_state::gottlieb2, gottlieb_core) +MACHINE_CONFIG_START(gottlieb_state::gottlieb2) + gottlieb_core(config); MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(gottlieb_state::g2laser, gottlieb_core) +MACHINE_CONFIG_START(gottlieb_state::g2laser) + gottlieb_core(config); MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) @@ -1826,13 +1829,15 @@ MACHINE_CONFIG_END *************************************/ -MACHINE_CONFIG_DERIVED(gottlieb_state::gottlieb1_votrax, gottlieb_core) +MACHINE_CONFIG_START(gottlieb_state::gottlieb1_votrax) + gottlieb_core(config); MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_VOTRAX, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(gottlieb_state::reactor, gottlieb1_votrax) +MACHINE_CONFIG_START(gottlieb_state::reactor) + gottlieb1_votrax(config); /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1842,23 +1847,27 @@ MACHINE_CONFIG_DERIVED(gottlieb_state::reactor, gottlieb1_votrax) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(gottlieb_state::qbert, gottlieb1_votrax) +MACHINE_CONFIG_START(gottlieb_state::qbert) + gottlieb1_votrax(config); /* sound hardware */ - MCFG_FRAGMENT_ADD(qbert_knocker) + qbert_knocker(config); MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(gottlieb_state::tylz, gottlieb1_votrax) +MACHINE_CONFIG_START(gottlieb_state::tylz) + gottlieb1_votrax(config); MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(gottlieb_state::screwloo, gottlieb2) +MACHINE_CONFIG_START(gottlieb_state::screwloo) + gottlieb2(config); MCFG_VIDEO_START_OVERRIDE(gottlieb_state,screwloo) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(gottlieb_state::cobram3, gottlieb_core) +MACHINE_CONFIG_START(gottlieb_state::cobram3) + gottlieb_core(config); MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0) MCFG_GOTTLIEB_ENABLE_COBRAM3_MODS() MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) |