Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 17:00:53 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

nintendo/playch10.cpp: Added separate gun trigger input. (#10691)

Browse Source 
Also fixed incorrect Zapper-like trigger behavior and made gun alarm wire machine configurable.
This commit is contained in:
0kmg 2022-12-16 09:56:42 -08:00 committed by GitHub
parent d3ed52d68e
commit 0c3654a5c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mame/nintendo/playch10.cpp
View File

@ -324,6 +324,7 @@ public:
, m_in(*this, "P%u", 1U)
, m_gunx(*this, "GUNX")
, m_guny(*this, "GUNY")
, m_trigger(*this, "TRIGGER")
, m_nt_page(*this, "nt_page%u", 0U)
, m_prg_banks(*this, "prg%u", 0U)
, m_prg_view(*this, "prg_view")
@ -450,6 +451,7 @@ private:
required_ioport_array<2> m_in;
optional_ioport m_gunx;
optional_ioport m_guny;
optional_ioport m_trigger;
required_memory_bank_array<4> m_nt_page;
std::unique_ptr<u8[]> m_nt_ram;
@ -858,14 +860,12 @@ u8 playch10_state::pc10_in1_r()
// do the gun thing
if (m_pc10_gun_controller)
{
int trigger = m_in[0]->read();
if (!m_sensor->detect_light(m_gunx->read(), m_guny->read()))
ret |= 0x08;
// now, add the trigger if not masked
if (!m_cntrl_mask)
ret |= (trigger & 2) << 3;
ret |= m_trigger->read() << 4;
}
// some games expect bit 6 to be set because the last entry on the data bus shows up
@ -1834,18 +1834,18 @@ static INPUT_PORTS_START( playch10 )
PORT_DIPSETTING( 0x80, DEF_STR( Free_Play ) )
PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 Button A")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Button B")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("%p A") PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("%p B") PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Game Select")
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P2 Button A") PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P2 Button B") PORT_PLAYER(2)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("%p A") PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("%p B") PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) // wired to 1p select button
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) // wired to 1p start button
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@ -1858,6 +1858,9 @@ INPUT_PORTS_END
static INPUT_PORTS_START( playc10g )
PORT_INCLUDE(playch10)
PORT_START("TRIGGER")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Gun Trigger")
PORT_START("GUNX") // IN2 - FAKE - Gun X pos
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_MINMAX(0, 255)

8
src/mame/nintendo/vsnes.cpp
View File

@ -1221,10 +1221,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vsnes_zapper )
PORT_START("IN0")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) // low 6 bits always read 0b010000
PORT_CONFNAME( 0x10, 0x10, "Gun Alarm Wire" ) // ALM wire (ignored by Gumshoe and Freedom Force?)
PORT_CONFSETTING( 0x00, "Disconnected" )
PORT_CONFSETTING( 0x10, "Connected" )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) // sprite hit
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // gun trigger
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_CUSTOM ) // gun HIT
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // gun TRG
PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )