From 53d0ab4c15f8e3a60f208fffcb6ed3b3fc4cc2b8 Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 16 Dec 2019 12:05:19 +0100 Subject: [PATCH] hh*: workaround for games being unplayable due to conflict with mouse button (nw) --- src/mame/drivers/cgang.cpp | 2 +- src/mame/drivers/hh_cop400.cpp | 9 ++++++--- src/mame/drivers/hh_pic16.cpp | 9 ++++++--- src/mame/drivers/hh_tms1k.cpp | 13 ++++++++----- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/mame/drivers/cgang.cpp b/src/mame/drivers/cgang.cpp index 8740040135e..a1f3dc96bec 100644 --- a/src/mame/drivers/cgang.cpp +++ b/src/mame/drivers/cgang.cpp @@ -444,7 +444,7 @@ WRITE8_MEMBER(cgang_state::ppi3_a_w) WRITE8_MEMBER(cgang_state::ppi3_b_w) { - // PA0-PA4: cosmogang motor power + // PB0-PB4: cosmogang motor power m_cg_motor_on = data & 0x1f; // PB5: game over(winning) lamp diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index 5380f7a25da..51567e4d1ed 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -44,6 +44,9 @@ //#include "hh_cop400_test.lh" // common test-layout - use external artwork +// workaround to disable default LMB on IPT_BUTTON1 when running MAME with -mouse, conflict with clickable artwork +#define PORT_BUTTON1_NOMOUSE PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1_INDEXED(0)) + class hh_cop400_state : public driver_device { @@ -203,7 +206,7 @@ static INPUT_PORTS_START( ctstein ) PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("IN.2") // G2 port L - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Red Button") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE PORT_NAME("Red Button") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Yellow Button") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Green Button") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Blue Button") @@ -898,7 +901,7 @@ static INPUT_PORTS_START( funjacks ) PORT_START("IN.2") // D2 port G PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON6 ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) // positioned at 1 o'clock on panel, increment clockwise + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE // positioned at 1 o'clock on panel, increment clockwise PORT_START("IN.3") // port G PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -1349,7 +1352,7 @@ READ8_MEMBER(lightfgt_state::read_g) static INPUT_PORTS_START( lightfgt ) PORT_START("IN.0") // SO port G PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON6 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) // note: button 1 is on the left side from player perspective + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE // note: button 1 is on the left side from player perspective PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_COCKTAIL PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_COCKTAIL diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp index 9a566101ef4..4bbe3234e08 100644 --- a/src/mame/drivers/hh_pic16.cpp +++ b/src/mame/drivers/hh_pic16.cpp @@ -68,6 +68,9 @@ #include "hh_pic16_test.lh" // common test-layout - use external artwork +// workaround to disable default LMB on IPT_BUTTON1 when running MAME with -mouse, conflict with clickable artwork +#define PORT_BUTTON1_NOMOUSE PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1_INDEXED(0)) + class hh_pic16_state : public driver_device { @@ -260,7 +263,7 @@ static INPUT_PORTS_START( touchme ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Skill") PORT_START("IN.1") // B1 port A - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Blue Button") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE PORT_NAME("Blue Button") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Yellow Button") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Red Button") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Green Button") @@ -602,7 +605,7 @@ WRITE8_MEMBER(maniac_state::write_c) static INPUT_PORTS_START( maniac ) PORT_START("IN.0") // port A - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // top button, increment clockwise + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE PORT_PLAYER(1) // top button, increment clockwise PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) @@ -726,7 +729,7 @@ WRITE8_MEMBER(matchme_state::write_c) static INPUT_PORTS_START( matchme ) PORT_START("IN.0") // C4 port C - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) // purple + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE // purple PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) // pink PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) // yellow PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) // blue diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index 0463f4ac7cb..47b1bfcba59 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -249,6 +249,9 @@ //#include "hh_tms1k_test.lh" // common test-layout - use external artwork +// workaround to disable default LMB on IPT_BUTTON1 when running MAME with -mouse, conflict with clickable artwork +#define PORT_BUTTON1_NOMOUSE PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1_INDEXED(0)) + // machine_start/reset @@ -6970,7 +6973,7 @@ static INPUT_PORTS_START( simon ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.1") // R1 - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Green Button") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE PORT_NAME("Green Button") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Red Button") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Yellow Button") PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Blue Button") @@ -7133,7 +7136,7 @@ static INPUT_PORTS_START( ssimon ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P1 Yellow Button") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P1 Green Button") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 Blue Button") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Red Button") + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE PORT_NAME("P1 Red Button") PORT_START("IN.4") // R9 PORT_CONFNAME( 0x0f, 0x02, DEF_STR( Difficulty ) ) @@ -11271,7 +11274,7 @@ static INPUT_PORTS_START( copycat ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Green Button") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Red Button") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Orange Button") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Yellow Button") + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE PORT_NAME("Yellow Button") PORT_START("IN.1") // R5 PORT_CONFNAME( 0x0f, 0x01, DEF_STR( Difficulty ) ) @@ -11380,7 +11383,7 @@ static INPUT_PORTS_START( copycatm2 ) PORT_START("IN.0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Orange Button") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Red Button") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Yellow Button") + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE PORT_NAME("Yellow Button") PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Green Button") INPUT_PORTS_END @@ -11463,7 +11466,7 @@ WRITE16_MEMBER(ditto_state::write_o) static INPUT_PORTS_START( ditto ) PORT_START("IN.0") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Yellow Button") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BUTTON1_NOMOUSE PORT_NAME("Yellow Button") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Blue Button") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Orange Button") PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Red Button")