summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/gameplan.h
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/includes/gameplan.h
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/includes/gameplan.h')
-rw-r--r--src/mame/includes/gameplan.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h
index 5d28eddcf01..0eb102f8e18 100644
--- a/src/mame/includes/gameplan.h
+++ b/src/mame/includes/gameplan.h
@@ -48,8 +48,6 @@ public:
m_screen(*this, "screen"),
m_soundlatch(*this, "soundlatch") { }
- void video_start() override;
-
/* machine state */
uint8_t m_current_port;
optional_shared_ptr<uint8_t> m_trvquest_question;
@@ -82,11 +80,15 @@ public:
DECLARE_WRITE_LINE_MEMBER(audio_trigger_w);
DECLARE_WRITE_LINE_MEMBER(r6532_irq);
DECLARE_WRITE8_MEMBER(r6532_soundlatch_w);
- void machine_start_gameplan() ATTR_COLD;
- void machine_reset_gameplan();
- void machine_start_trvquest() ATTR_COLD;
- void machine_reset_trvquest();
- void video_reset_gameplan();
+ DECLARE_MACHINE_START(gameplan);
+ DECLARE_MACHINE_RESET(gameplan);
+ DECLARE_MACHINE_START(trvquest);
+ DECLARE_MACHINE_RESET(trvquest);
+ DECLARE_VIDEO_START(gameplan);
+ DECLARE_VIDEO_RESET(gameplan);
+ DECLARE_VIDEO_START(leprechn);
+ DECLARE_VIDEO_START(trvquest);
+ DECLARE_VIDEO_START(common);
uint32_t screen_update_gameplan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_leprechn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(trvquest_interrupt);