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

PCE - rip out old controller config logic

This commit is contained in:
adelikat 2017-07-18 11:05:11 -05:00
parent 9fc8b8700d
commit 46e4ae05d6
3 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ISettable.cs
View File

@ -38,7 +38,6 @@ namespace BizHawk.Emulation.Cores.PCEngine
{
bool ret = PCESyncSettings.NeedsReboot(o, _syncSettings);
_syncSettings = o;
// SetControllerButtons(); // not safe to change the controller during emulation, so instead make it a reboot event
return ret;
}
@ -95,25 +94,11 @@ namespace BizHawk.Emulation.Cores.PCEngine
[TypeConverter(typeof(DescribableEnumConverter))]
public PceControllerType Port5 { get; set; } = PceControllerType.Unplugged;
public ControllerSetting[] Controllers =
{
new ControllerSetting { IsConnected = true },
new ControllerSetting { IsConnected = false },
new ControllerSetting { IsConnected = false },
new ControllerSetting { IsConnected = false },
new ControllerSetting { IsConnected = false }
};
public PCESyncSettings Clone()
{
return (PCESyncSettings)MemberwiseClone();
}
public class ControllerSetting
{
public bool IsConnected { get; set; }
}
public static bool NeedsReboot(PCESyncSettings x, PCESyncSettings y)
{
return x.Port1 != y.Port1

41
BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs
View File

@ -1,46 +1,7 @@
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.PCEngine
namespace BizHawk.Emulation.Cores.PCEngine
{
public partial class PCEngine
{
private readonly ControllerDefinition PCEngineController = new ControllerDefinition
{
Name = "PC Engine Controller",
BoolButtons =
{
"P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Select", "P1 Run", "P1 B2", "P1 B1",
"P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Select", "P2 Run", "P2 B2", "P2 B1",
"P3 Up", "P3 Down", "P3 Left", "P3 Right", "P3 Select", "P3 Run", "P3 B2", "P3 B1",
"P4 Up", "P4 Down", "P4 Left", "P4 Right", "P4 Select", "P4 Run", "P4 B2", "P4 B1",
"P5 Up", "P5 Down", "P5 Left", "P5 Right", "P5 Select", "P5 Run", "P5 B2", "P5 B1"
}
};
private void SetControllerButtons()
{
ControllerDefinition.BoolButtons.Clear();
ControllerDefinition.FloatControls.Clear();
for (int i = 0; i < 5; i++)
{
if (_syncSettings.Controllers[i].IsConnected)
{
ControllerDefinition.BoolButtons.AddRange(new[]
{
"P" + (i + 1) + " Up",
"P" + (i + 1) + " Down",
"P" + (i + 1) + " Left",
"P" + (i + 1) + " Right",
"P" + (i + 1) + " Select",
"P" + (i + 1) + " Run",
"P" + (i + 1) + " B1",
"P" + (i + 1) + " B2"
});
}
}
}
private int SelectedController;
private byte InputByte;

2
BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
View File

@ -48,7 +48,6 @@ namespace BizHawk.Emulation.Cores.PCEngine
_syncSettings.Port3,
_syncSettings.Port4,
_syncSettings.Port5);
//SetControllerButtons(); // TODO: get rid of this method
}
public PCEngine(CoreComm comm, GameInfo game, Disc disc, object Settings, object syncSettings)
@ -110,7 +109,6 @@ namespace BizHawk.Emulation.Cores.PCEngine
_syncSettings.Port3,
_syncSettings.Port4,
_syncSettings.Port5);
//SetControllerButtons();
}
// ROM