ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nyma - activate controller deck names

This commit is contained in:
nattthebear 2020-06-21 16:55:41 -04:00
parent cf4a0176a3
commit 53c2318b56
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Faust/Faust.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Faust
[CoreConstructor("SNES")]
public Faust(GameInfo game, byte[] rom, CoreComm comm, string extension,
NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
: base(comm, "SNES", "I don't think anything uses this parameter", settings, syncSettings)
: base(comm, "SNES", "SNES Controller", settings, syncSettings)
{
if (deterministic)
// force ST renderer

8
src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
View File

@ -19,7 +19,8 @@ namespace BizHawk.Emulation.Cores.Waterbox
private void InitControls(List<NPortInfoT> allPorts, bool hasCds, ref SystemInfo si)
{
_controllerAdapter = new ControllerAdapter(
allPorts, _syncSettingsActual.PortDevices, OverrideButtonName, hasCds, ref si, ComputeHiddenPorts());
allPorts, _syncSettingsActual.PortDevices, OverrideButtonName, hasCds, ref si, ComputeHiddenPorts(),
_controllerDeckName);
_nyma.SetInputDevices(_controllerAdapter.Devices);
ControllerDefinition = _controllerAdapter.Definition;
}
@ -39,11 +40,12 @@ namespace BizHawk.Emulation.Cores.Waterbox
Func<string, string> overrideName,
bool hasCds,
ref SystemInfo systemInfo,
HashSet<string> hiddenPorts)
HashSet<string> hiddenPorts,
string controllerDeckName)
{
var ret = new ControllerDefinition
{
Name = "Mednafen Controller",
Name = controllerDeckName,
CategoryLabels =
{
{ "Power", "System" },