diff options
author | Olivier Galibert <galibert@pobox.com> | 2018-01-07 22:20:14 +0100 |
---|---|---|
committer | Olivier Galibert <galibert@pobox.com> | 2018-01-17 16:11:18 +0100 |
commit | d469cc04bcace0f601802301caeddc5b473b75f2 (patch) | |
tree | a9d71540c9c69cee5ab3a533476b81833fa02f5f /src/mame/drivers/gottlieb.cpp | |
parent | 9f383f76ce6f00cc3320e5ba53dc323781e0077b (diff) |
API Change: Machine configs are now a method of the owner class, and the prototype is simplified [O. Galibert]
Beware, the device context does not follow in MCFG_FRAGMENT_ADD
anymore due to the prototype change. So creating a device then
configuring through a fragment doesn't work as-is. The simplest
solution is just to add a MCFG_DEVICE_MODIFY at the start of the
fragment with the correct tag.
Diffstat (limited to 'src/mame/drivers/gottlieb.cpp')
-rw-r--r-- | src/mame/drivers/gottlieb.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index df603359dab..5d68fb43851 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -672,7 +672,7 @@ static const char *const qbert_knocker_names[] = nullptr /* end of array */ }; -MACHINE_CONFIG_START( qbert_knocker ) +MACHINE_CONFIG_START(gottlieb_state::qbert_knocker) MCFG_SPEAKER_ADD("knocker", 0.0, 0.0, 1.0) MCFG_SOUND_ADD("knocker_sam", SAMPLES, 0) @@ -1764,7 +1764,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( gottlieb_core ) +MACHINE_CONFIG_START(gottlieb_state::gottlieb_core) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, CPU_CLOCK/3) @@ -1789,24 +1789,24 @@ static MACHINE_CONFIG_START( gottlieb_core ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gottlieb1, gottlieb_core ) +MACHINE_CONFIG_DERIVED(gottlieb_state::gottlieb1, gottlieb_core) MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gottlieb2, gottlieb_core ) +MACHINE_CONFIG_DERIVED(gottlieb_state::gottlieb2, gottlieb_core) MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( g2laser, gottlieb_core ) +MACHINE_CONFIG_DERIVED(gottlieb_state::g2laser, gottlieb_core) MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MCFG_LASERDISC_PR8210_ADD("laserdisc") - MCFG_LASERDISC_AUDIO(laserdisc_device::audio_delegate(&gottlieb_state::laserdisc_audio_process, downcast<gottlieb_state*>(owner))) + MCFG_LASERDISC_AUDIO(laserdisc_device::audio_delegate(&gottlieb_state::laserdisc_audio_process, this)) MCFG_LASERDISC_OVERLAY_DRIVER(GOTTLIEB_VIDEO_HCOUNT, GOTTLIEB_VIDEO_VCOUNT, gottlieb_state, screen_update_gottlieb) MCFG_LASERDISC_OVERLAY_CLIP(0, GOTTLIEB_VIDEO_HBLANK-1, 0, GOTTLIEB_VIDEO_VBLANK-8) MCFG_LASERDISC_OVERLAY_PALETTE("palette") @@ -1826,13 +1826,13 @@ MACHINE_CONFIG_END *************************************/ -static MACHINE_CONFIG_DERIVED( gottlieb1_votrax, gottlieb_core ) +MACHINE_CONFIG_DERIVED(gottlieb_state::gottlieb1_votrax, gottlieb_core) MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_VOTRAX, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( reactor, gottlieb1_votrax ) +MACHINE_CONFIG_DERIVED(gottlieb_state::reactor, gottlieb1_votrax) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1842,29 +1842,29 @@ static MACHINE_CONFIG_DERIVED( reactor, gottlieb1_votrax ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qbert, gottlieb1_votrax ) +MACHINE_CONFIG_DERIVED(gottlieb_state::qbert, gottlieb1_votrax) /* sound hardware */ MCFG_FRAGMENT_ADD(qbert_knocker) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tylz, gottlieb1_votrax ) +MACHINE_CONFIG_DERIVED(gottlieb_state::tylz, gottlieb1_votrax) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( screwloo, gottlieb2 ) +MACHINE_CONFIG_DERIVED(gottlieb_state::screwloo, gottlieb2) MCFG_VIDEO_START_OVERRIDE(gottlieb_state,screwloo) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cobram3, gottlieb_core ) +MACHINE_CONFIG_DERIVED(gottlieb_state::cobram3, gottlieb_core) MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0) MCFG_GOTTLIEB_ENABLE_COBRAM3_MODS() MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MCFG_LASERDISC_PR8210_ADD("laserdisc") - MCFG_LASERDISC_AUDIO(laserdisc_device::audio_delegate(&gottlieb_state::laserdisc_audio_process, downcast<gottlieb_state*>(owner))) + MCFG_LASERDISC_AUDIO(laserdisc_device::audio_delegate(&gottlieb_state::laserdisc_audio_process, this)) MCFG_LASERDISC_OVERLAY_DRIVER(GOTTLIEB_VIDEO_HCOUNT, GOTTLIEB_VIDEO_VCOUNT, gottlieb_state, screen_update_gottlieb) MCFG_LASERDISC_OVERLAY_CLIP(0, GOTTLIEB_VIDEO_HBLANK-1, 0, GOTTLIEB_VIDEO_VBLANK-8) MCFG_LASERDISC_OVERLAY_PALETTE("palette") |