summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/ninjakd2.cpp
diff options
context:
space:
mode:
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
commit166638ce8093e04884166296469bda82882890fd (patch)
tree6dedcf3bde5d05843695efaf4949ab285d3193f1 /src/mame/drivers/ninjakd2.cpp
parent8e796a2075415427491a541b75884aea6e21f6a9 (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/ninjakd2.cpp')
-rw-r--r--src/mame/drivers/ninjakd2.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp
index 852d1e399da..c6d3302ba6d 100644
--- a/src/mame/drivers/ninjakd2.cpp
+++ b/src/mame/drivers/ninjakd2.cpp
@@ -914,14 +914,14 @@ void ninjakd2_state::machine_reset()
m_rom_bank_mask = num_banks - 1;
}
-void ninjakd2_state::machine_start_omegaf()
+MACHINE_START_MEMBER(ninjakd2_state,omegaf)
{
omegaf_io_protection_start();
machine_start();
}
-void ninjakd2_state::machine_reset_omegaf()
+MACHINE_RESET_MEMBER(ninjakd2_state,omegaf)
{
omegaf_io_protection_reset();
@@ -1004,7 +1004,7 @@ MACHINE_CONFIG_START(ninjakd2_state::mnight)
MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
/* video hardware */
- set_video_start_cb(config, driver_callback_delegate(&video_start_mnight, this));
+ MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,mnight)
/* sound hardware */
MCFG_DEVICE_REMOVE("pcm")
@@ -1020,7 +1020,7 @@ MACHINE_CONFIG_START(ninjakd2_state::arkarea)
MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
/* video hardware */
- set_video_start_cb(config, driver_callback_delegate(&video_start_arkarea, this));
+ MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,arkarea)
/* sound hardware */
MCFG_DEVICE_REMOVE("pcm")
@@ -1043,7 +1043,7 @@ MACHINE_CONFIG_START(ninjakd2_state::robokid)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG)
- set_video_start_cb(config, driver_callback_delegate(&video_start_robokid, this));
+ MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,robokid)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(ninjakd2_state, screen_update_robokid)
MACHINE_CONFIG_END
@@ -1058,11 +1058,11 @@ MACHINE_CONFIG_START(ninjakd2_state::omegaf)
MCFG_DEVICE_MODIFY("soundcpu")
MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_omegaf, this));
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_omegaf, this));
+ MCFG_MACHINE_START_OVERRIDE(ninjakd2_state,omegaf)
+ MCFG_MACHINE_RESET_OVERRIDE(ninjakd2_state,omegaf)
/* video hardware */
- set_video_start_cb(config, driver_callback_delegate(&video_start_omegaf, this));
+ MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,omegaf)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(ninjakd2_state, screen_update_omegaf)
MACHINE_CONFIG_END