From 60614ffa7be52c6cb40f030fd227bce0a30194ed Mon Sep 17 00:00:00 2001
From: nattthebear <goyuken@gmail.com>
Date: Sat, 13 Jun 2020 16:39:21 -0400
Subject: [PATCH] PCE:  Hide controllers 2-5 if multitap is disabled

They have no power in that situation
---
 .../Consoles/NEC/PCE/TurboNyma.cs             | 15 ++++++++++++
 .../Waterbox/NymaCore.Controller.cs           | 23 ++++++++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs
index 1becd89ed8..8ed4b71043 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs
@@ -69,6 +69,21 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE
 			["RUN"] = "Run"
 		};
 
+		protected override HashSet<string> ComputeHiddenPorts()
+		{
+			if (SettingsQuery("pce.input.multitap") == "1")
+			{
+				return new HashSet<string>();
+			}
+			else
+			{
+				return new HashSet<string>
+				{
+					"port2", "port3", "port4", "port5"
+				};
+			}
+		}
+
 		// pce always has two layers, sgx always has 4, and mednafen knows this
 		public bool IsSgx => SettingsInfo.LayerNames.Count == 4;
 
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
index 2197ecca14..056f4169bb 100644
--- a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
+++ b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
@@ -15,7 +15,8 @@ namespace BizHawk.Emulation.Cores.Waterbox
 
 		private void InitControls(List<NPortInfoT> allPorts, bool hasCds)
 		{
-			_controllerAdapter = new ControllerAdapter(allPorts, _syncSettingsActual.PortDevices, ButtonNameOverrides, hasCds);
+			_controllerAdapter = new ControllerAdapter(
+				allPorts, _syncSettingsActual.PortDevices, ButtonNameOverrides, hasCds, ComputeHiddenPorts());
 			_nyma.SetInputDevices(_controllerAdapter.Devices);
 			ControllerDefinition = _controllerAdapter.Definition;
 		}
@@ -37,7 +38,12 @@ namespace BizHawk.Emulation.Cores.Waterbox
 			/// </summary>
 			public string[] Devices { get; }
 			public ControllerDefinition Definition { get; }
-			public ControllerAdapter(List<NPortInfoT> allPorts, IDictionary<int, string> config, IDictionary<string, string> overrides, bool hasCds)
+			public ControllerAdapter(
+				List<NPortInfoT> allPorts,
+				IDictionary<int, string> config,
+				IDictionary<string, string> overrides,
+				bool hasCds,
+				HashSet<string> hiddenPorts)
 			{
 				var ret = new ControllerDefinition
 				{
@@ -62,6 +68,9 @@ namespace BizHawk.Emulation.Cores.Waterbox
 					var deviceName = config.ContainsKey(port) ? config[port] : portInfo.DefaultDeviceShortName;
 					finalDevices.Add(deviceName);
 
+					if (hiddenPorts.Contains(portInfo.ShortName))
+						continue;
+
 					var devices = portInfo.Devices;
 					
 					var device = devices.FirstOrDefault(a => a.ShortName == deviceName);
@@ -264,6 +273,14 @@ namespace BizHawk.Emulation.Cores.Waterbox
 			}
 		}
 
-		protected virtual IDictionary<string, string> ButtonNameOverrides { get; }= new Dictionary<string, string>();
+		protected virtual IDictionary<string, string> ButtonNameOverrides { get; } = new Dictionary<string, string>();
+		/// <summary>
+		/// On some cores, some controller ports are not relevant when certain settings are off (like multitap).
+		/// Override this if your core has such an issue
+		/// </summary>
+		protected virtual HashSet<string> ComputeHiddenPorts()
+		{
+			return new HashSet<string>();
+		}
 	}
 }