From 45710aacf1c056cc930ec44df934f8f17dc077b7 Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 14 Dec 2021 15:23:16 +0100 Subject: [PATCH] tandy2k: don't check input port string to determine button --- src/mame/drivers/tandy2k.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp index 02ed64b3754..e8c96494dab 100644 --- a/src/mame/drivers/tandy2k.cpp +++ b/src/mame/drivers/tandy2k.cpp @@ -405,8 +405,8 @@ static INPUT_PORTS_START( tandy2k ) // defined in machine/tandy2kb.c PORT_START("MOUSEBTN") PORT_BIT( 0xff8f, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(MOUSECODE_BUTTON1) PORT_CHANGED_MEMBER(DEVICE_SELF, tandy2k_state, input_changed, 0) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(MOUSECODE_BUTTON2) PORT_CHANGED_MEMBER(DEVICE_SELF, tandy2k_state, input_changed, 0) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(MOUSECODE_BUTTON1) PORT_CHANGED_MEMBER(DEVICE_SELF, tandy2k_state, input_changed, 1) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(MOUSECODE_BUTTON2) PORT_CHANGED_MEMBER(DEVICE_SELF, tandy2k_state, input_changed, 1) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) /* this would be button three but AFAIK no tandy mouse ever had one */ PORT_START("MOUSEX") @@ -479,7 +479,10 @@ INPUT_CHANGED_MEMBER(tandy2k_state::input_changed) { if (m_clkmouse_cnt || !m_clkmouse_irq) return; - if ((m_clkmouse_irq & BT_IRQ) && (field.name()[5] == 'B')) + + const bool is_button = bool(param); + + if ((m_clkmouse_irq & BT_IRQ) && is_button) { m_clkmouse_cnt = 1; m_clkmouse_cmd[0] = 'B';