From 8b9debb8b9e450877b753fc362f206274ac1eb2c Mon Sep 17 00:00:00 2001 From: nattthebear Date: Tue, 16 Jun 2020 10:20:11 -0400 Subject: [PATCH] Hide mission stick autofires again I hope someone comes into irc screaming about how they can't do their TAS because we don't support the exact hardware semantics of the mission stick, but the more realistic outcome is that no one ever uses the mission stick for anything --- .../Waterbox/NymaCore.Controller.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs index e2baff5295..979a40db7e 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs @@ -127,7 +127,7 @@ namespace BizHawk.Emulation.Cores.Waterbox var data = input.Extra.AsSwitch(); if (data.Positions.Count > 8) throw new NotImplementedException("Need code changes to support Mdfn switch with more than 8 positions"); - + // fake switches as a series of push downs that select each state // imagine the "gear" selector on a Toyota Prius @@ -138,10 +138,15 @@ namespace BizHawk.Emulation.Cores.Waterbox switchPreviousFrame.Add(0); var names = data.Positions.Select(p => $"{name}: Set {p.Name}").ToArray(); - foreach (var n in names) + if (!input.Name.StartsWith("AF ") && !input.Name.EndsWith(" AF")) // hack: don't support some devices { - ret.BoolButtons.Add(n); - ret.CategoryLabels[n] = category; + foreach (var n in names) + { + { + ret.BoolButtons.Add(n); + ret.CategoryLabels[n] = category; + } + } } _thunks.Add((c, b) =>