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/videopkr.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/videopkr.cpp')
-rw-r--r-- | src/mame/drivers/videopkr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp index 91d870f2e02..6d91c5ca464 100644 --- a/src/mame/drivers/videopkr.cpp +++ b/src/mame/drivers/videopkr.cpp @@ -371,7 +371,7 @@ public: virtual void machine_start() override; virtual void video_start() override; DECLARE_PALETTE_INIT(videopkr); - void video_start_vidadcba() ATTR_COLD; + DECLARE_VIDEO_START(vidadcba); DECLARE_PALETTE_INIT(babypkr); DECLARE_PALETTE_INIT(fortune1); uint32_t screen_update_videopkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -546,7 +546,7 @@ void videopkr_state::video_start() m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(videopkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } -void videopkr_state::video_start_vidadcba() +VIDEO_START_MEMBER(videopkr_state,vidadcba) { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(videopkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); } @@ -1333,7 +1333,7 @@ MACHINE_CONFIG_START(videopkr_state::videodad) MCFG_SCREEN_VISIBLE_AREA(4*16, 31*16-1, 2*8, 30*8-1) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_videodad) - set_video_start_cb(config, driver_callback_delegate(&video_start_vidadcba, this)); + MCFG_VIDEO_START_OVERRIDE(videopkr_state,vidadcba) MACHINE_CONFIG_END @@ -1364,7 +1364,7 @@ MACHINE_CONFIG_START(videopkr_state::babypkr) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(videopkr_state,babypkr) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_videodad) - set_video_start_cb(config, driver_callback_delegate(&video_start_vidadcba, this)); + MCFG_VIDEO_START_OVERRIDE(videopkr_state,vidadcba) MCFG_DEVICE_ADD("aysnd", AY8910, CPU_CLOCK / 6) /* no ports used */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) |