From 7d1ff26fb32c237aeaca842280829a59f1992dd5 Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Mon, 6 Dec 2021 03:13:53 +1100
Subject: [PATCH] Fixed MT07153 (SlikStick configuration for asteroid not
 working).

Since asteroid overrides the default input assignments, slikstik.cfg
needs to use the syntax for overriding specific inputs.  There was also
a bug in how specific input overrides are applied.
---
 ctrlr/slikstik.cfg | 10 +++++-----
 src/emu/ioport.cpp |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ctrlr/slikstik.cfg b/ctrlr/slikstik.cfg
index 42456f31d80..8815980a6b5 100644
--- a/ctrlr/slikstik.cfg
+++ b/ctrlr/slikstik.cfg
@@ -176,19 +176,19 @@
 		-->
 
 		<input>
-			<port type="P1_JOYSTICK_LEFT">
+			<port tag=":IN1" type="P1_BUTTON1" mask="128">
 				<newseq type="standard">KEYCODE_LEFT       OR JOYCODE_1_XAXIS_LEFT_SWITCH    OR KEYCODE_0</newseq>
 			</port>
-			<port type="P1_JOYSTICK_RIGHT">
+			<port tag=":IN1" type="P1_BUTTON2" mask="64">
 				<newseq type="standard">KEYCODE_RIGHT      OR JOYCODE_1_XAXIS_RIGHT_SWITCH   OR KEYCODE_Z</newseq>
 			</port>
-			<port type="P1_BUTTON1">
+			<port tag=":IN0" type="P1_BUTTON3" mask="16">
 				<newseq type="standard">KEYCODE_H          OR JOYCODE_1_BUTTON1 OR MOUSECODE_1_BUTTON1</newseq>
 			</port>
-			<port type="P1_BUTTON2">
+			<port tag=":IN1" type="P1_BUTTON4" mask="32">
 				<newseq type="standard">KEYCODE_7          OR JOYCODE_1_BUTTON2 OR KEYCODE_L</newseq>
 			</port>
-			<port type="P1_BUTTON3">
+			<port tag=":IN0" type="P1_BUTTON5" mask="8">
 				<newseq type="standard">KEYCODE_9          OR JOYCODE_1_BUTTON3 OR MOUSECODE_1_BUTTON2</newseq>
 			</port>
 		</input>
diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp
index 0ea7974caf5..7bc4c455b78 100644
--- a/src/emu/ioport.cpp
+++ b/src/emu/ioport.cpp
@@ -2313,7 +2313,10 @@ bool ioport_manager::load_controller_config(
 			for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype)
 			{
 				if (input_seq_good(machine(), newseq[seqtype].first))
+				{
+					field.live().seq[seqtype] = newseq[seqtype].first;
 					field.set_defseq(seqtype, newseq[seqtype].first);
+				}
 			}
 
 			// fetch configurable attributes