diff options
author | 2017-12-13 21:01:10 -0700 | |
---|---|---|
committer | 2017-12-13 21:01:10 -0700 | |
commit | 54155441e9ba9941e85d80c4834a66376a11e791 (patch) | |
tree | aa44bdaf0035cbe188d64c447f225f10f7d76d8d /src/mame/drivers/midas.cpp | |
parent | f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4 (diff) |
Revert "Merge branch 'master' of https://github.com/mamedev/mame"
This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing
changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5.
Diffstat (limited to 'src/mame/drivers/midas.cpp')
-rw-r--r-- | src/mame/drivers/midas.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp index 983e233dfb2..bb4139bb056 100644 --- a/src/mame/drivers/midas.cpp +++ b/src/mame/drivers/midas.cpp @@ -72,8 +72,6 @@ public: m_palette(*this, "palette"), m_sprgen(*this, "spritegen"), m_screen(*this, "screen"), - m_prize(*this, "prize%u", 1), - m_ticket(*this, "ticket"), m_zoomram(*this, "zoomtable") { } @@ -98,8 +96,6 @@ public: required_device<palette_device> m_palette; required_device<neosprite_midas_device> m_sprgen; required_device<screen_device> m_screen; - optional_device_array<ticket_dispenser_device, 2> m_prize; - optional_device<ticket_dispenser_device> m_ticket; required_shared_ptr<uint16_t> m_zoomram; DECLARE_WRITE_LINE_MEMBER(screen_vblank_midas); @@ -241,8 +237,8 @@ WRITE16_MEMBER(midas_state::hammer_coin_w) { if (ACCESSING_BITS_0_7) { - machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); - machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); + machine().bookkeeping().coin_counter_w(0, data & 0x0001); + machine().bookkeeping().coin_counter_w(1, data & 0x0002); } #ifdef MAME_DEBUG // popmessage("coin %04X", data); @@ -253,9 +249,9 @@ WRITE16_MEMBER(midas_state::hammer_motor_w) { if (ACCESSING_BITS_0_7) { - m_prize[0]->motor_w(BIT(data, 0)); - m_prize[1]->motor_w(BIT(data, 1)); - m_ticket->motor_w(BIT(data, 4)); + machine().device<ticket_dispenser_device>("prize1")->write(space, 0, (data & 0x0001) << 7); + machine().device<ticket_dispenser_device>("prize2")->write(space, 0, (data & 0x0002) << 6); + machine().device<ticket_dispenser_device>("ticket")->write(space, 0, (data & 0x0010) << 3); // data & 0x0080 ? } #ifdef MAME_DEBUG |