From 28dcceed0a3be6832d0f53a8b0a365f718ea8a4b Mon Sep 17 00:00:00 2001 From: eientei95 Date: Sat, 25 Jun 2022 10:28:31 +1200 Subject: missile.cpp: Improved inputs. (#9966) * Added correct factory default DIP switch settings. * Removed duplicate inputs from suprmatk. --- src/mame/drivers/missile.cpp | 86 +++++--------------------------------------- 1 file changed, 9 insertions(+), 77 deletions(-) (limited to 'src/mame/drivers') diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp index 80769627836..f7d94a79da0 100644 --- a/src/mame/drivers/missile.cpp +++ b/src/mame/drivers/missile.cpp @@ -993,15 +993,15 @@ static INPUT_PORTS_START( missile ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x18, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_TILT ) - PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_TOGGLE // switch inside the coin door PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(missile_state, vblank_r) PORT_START("R10") /* IN2 */ - PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("R10:1,2") - PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) ) + PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("R10:1,2") PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x02, DEF_STR( Free_Play ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) ) PORT_DIPNAME( 0x0c, 0x00, "Right Coin" ) PORT_DIPLOCATION("R10:3,4") PORT_DIPSETTING( 0x00, "*1" ) PORT_DIPSETTING( 0x04, "*4" ) @@ -1025,10 +1025,10 @@ static INPUT_PORTS_START( missile ) PORT_DIPSETTING( 0x01, "5" ) PORT_DIPSETTING( 0x03, "6" ) PORT_DIPSETTING( 0x00, "7" ) - PORT_DIPNAME( 0x04, 0x04, "Bonus Credit for 4 Coins" ) PORT_DIPLOCATION("R8:!3") + PORT_DIPNAME( 0x04, 0x00, "Bonus Credit for 4 Coins" ) PORT_DIPLOCATION("R8:!3") PORT_DIPSETTING( 0x04, DEF_STR( No ) ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x08, 0x08, "Trackball Size" ) PORT_DIPLOCATION("R8:!4") + PORT_DIPNAME( 0x08, 0x00, "Trackball Size" ) PORT_DIPLOCATION("R8:!4") PORT_DIPSETTING( 0x00, "Mini" ) // Faster Cursor Speed PORT_DIPSETTING( 0x08, "Large" ) // Slower Cursor Speed PORT_DIPNAME( 0x70, 0x70, "Bonus City" ) PORT_DIPLOCATION("R8:!5,!6,!7") @@ -1059,47 +1059,16 @@ INPUT_PORTS_END static INPUT_PORTS_START( missileb ) - PORT_INCLUDE(missile) PORT_MODIFY("IN1") - PORT_SERVICE( 0x40, IP_ACTIVE_HIGH ) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_TOGGLE // switch inside the coin door INPUT_PORTS_END static INPUT_PORTS_START( suprmatk ) - PORT_START("IN0") /* IN0 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 ) - - PORT_START("IN1") /* IN1 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x18, IP_ACTIVE_HIGH, IPT_CUSTOM ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_TILT ) - PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(missile_state, vblank_r) + PORT_INCLUDE(missile) - PORT_START("R10") /* IN2 */ - PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("R10:1,2") - PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Free_Play ) ) - PORT_DIPNAME( 0x0c, 0x00, "Right Coin" ) PORT_DIPLOCATION("R10:3,4") - PORT_DIPSETTING( 0x00, "*1" ) - PORT_DIPSETTING( 0x04, "*4" ) - PORT_DIPSETTING( 0x08, "*5" ) - PORT_DIPSETTING( 0x0c, "*6" ) - PORT_DIPNAME( 0x10, 0x00, "Center Coin" ) PORT_DIPLOCATION("R10:5") - PORT_DIPSETTING( 0x00, "*1" ) - PORT_DIPSETTING( 0x10, "*2" ) + PORT_MODIFY("R10") /* IN2 */ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("R10:6") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1108,43 +1077,6 @@ static INPUT_PORTS_START( suprmatk ) PORT_DIPSETTING( 0x40, "Easy Super Missile Attack" ) PORT_DIPSETTING( 0x80, "Reg. Super Missile Attack" ) PORT_DIPSETTING( 0xc0, "Hard Super Missile Attack" ) - - PORT_START("R8") /* IN3 */ - PORT_DIPNAME( 0x03, 0x00, "Cities" ) PORT_DIPLOCATION("R8:1,2") - PORT_DIPSETTING( 0x02, "4" ) - PORT_DIPSETTING( 0x01, "5" ) - PORT_DIPSETTING( 0x03, "6" ) - PORT_DIPSETTING( 0x00, "7" ) - PORT_DIPNAME( 0x04, 0x04, "Bonus Credit for 4 Coins" ) PORT_DIPLOCATION("R8:3") - PORT_DIPSETTING( 0x04, DEF_STR( No ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x08, 0x08, "Trackball Size" ) PORT_DIPLOCATION("R8:4") - PORT_DIPSETTING( 0x00, "Mini" ) // Faster Cursor Speed - PORT_DIPSETTING( 0x08, "Large" ) // Slower Cursor Speed - PORT_DIPNAME( 0x70, 0x70, "Bonus City" ) PORT_DIPLOCATION("R8:5,6,7") - PORT_DIPSETTING( 0x10, "8000" ) - PORT_DIPSETTING( 0x70, "10000" ) - PORT_DIPSETTING( 0x60, "12000" ) - PORT_DIPSETTING( 0x50, "14000" ) - PORT_DIPSETTING( 0x40, "15000" ) - PORT_DIPSETTING( 0x30, "18000" ) - PORT_DIPSETTING( 0x20, "20000" ) - PORT_DIPSETTING( 0x00, DEF_STR( None ) ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("R8:8") - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) ) - - PORT_START("TRACK0_X") /* FAKE */ - PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) - - PORT_START("TRACK0_Y") /* FAKE */ - PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE - - PORT_START("TRACK1_X") /* FAKE */ - PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL - - PORT_START("TRACK1_Y") /* FAKE */ - PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL INPUT_PORTS_END -- cgit v1.2.3