From 3109bdcc6a423fd531399e57a00081bab6e5f202 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 18 Jul 2017 11:20:02 -0500 Subject: [PATCH] PCE - cleanup --- .../config/PCE/PCEControllerConfig.cs | 5 +- .../Consoles/PC Engine/PCEngine.Input.cs | 24 ++++---- .../Consoles/PC Engine/PceControllerDeck.cs | 60 +++++++++---------- 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/BizHawk.Client.EmuHawk/config/PCE/PCEControllerConfig.cs b/BizHawk.Client.EmuHawk/config/PCE/PCEControllerConfig.cs index ba5af970fa..c67095376c 100644 --- a/BizHawk.Client.EmuHawk/config/PCE/PCEControllerConfig.cs +++ b/BizHawk.Client.EmuHawk/config/PCE/PCEControllerConfig.cs @@ -24,10 +24,7 @@ namespace BizHawk.Client.EmuHawk private void OkBtn_Click(object sender, EventArgs e) { - var pceSettings = ((PCEngine)Global.Emulator).GetSyncSettings(); - - pceSettings = _controllerSettings; - GlobalWin.MainForm.PutCoreSyncSettings(pceSettings); + GlobalWin.MainForm.PutCoreSyncSettings(_controllerSettings); DialogResult = DialogResult.OK; Close(); } diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs index b22c525347..015f16f8ad 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs +++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs @@ -2,25 +2,25 @@ { public partial class PCEngine { - private int SelectedController; - private byte InputByte; + private int _selectedController; + private byte _inputByte; - public bool SEL => (InputByte & 1) != 0; - public bool CLR => (InputByte & 2) != 0; + private bool Sel => (_inputByte & 1) != 0; + private bool Clr => (_inputByte & 2) != 0; private void WriteInput(byte value) { - bool prevSEL = SEL; - InputByte = value; + bool prevSel = Sel; + _inputByte = value; - if (SEL && CLR) + if (Sel && Clr) { - SelectedController = 0; + _selectedController = 0; } - if (CLR == false && prevSEL == false && SEL == true) + if (Clr == false && prevSel == false && Sel) { - SelectedController = (SelectedController + 1); + _selectedController = _selectedController + 1; } } @@ -31,11 +31,11 @@ InputCallbacks.Call(); byte value = 0x3F; - int player = SelectedController + 1; + int player = _selectedController + 1; if (player < 6) { _lagged = false; - value &= _controllerDeck.Read(player, _controller, SEL); + value &= _controllerDeck.Read(player, _controller, Sel); } if (Region == "Japan") diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PceControllerDeck.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PceControllerDeck.cs index ac5a9efd24..6108be5955 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PceControllerDeck.cs +++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PceControllerDeck.cs @@ -27,41 +27,41 @@ namespace BizHawk.Emulation.Cores.PCEngine PceControllerType controller4, PceControllerType controller5) { - Port1 = (IPort)Activator.CreateInstance(Implementors[(int)controller1], 1); - Port2 = (IPort)Activator.CreateInstance(Implementors[(int)controller2], 2); - Port3 = (IPort)Activator.CreateInstance(Implementors[(int)controller3], 3); - Port4 = (IPort)Activator.CreateInstance(Implementors[(int)controller4], 4); - Port5 = (IPort)Activator.CreateInstance(Implementors[(int)controller5], 5); + _port1 = (IPort)Activator.CreateInstance(Implementors[(int)controller1], 1); + _port2 = (IPort)Activator.CreateInstance(Implementors[(int)controller2], 2); + _port3 = (IPort)Activator.CreateInstance(Implementors[(int)controller3], 3); + _port4 = (IPort)Activator.CreateInstance(Implementors[(int)controller4], 4); + _port5 = (IPort)Activator.CreateInstance(Implementors[(int)controller5], 5); Definition = new ControllerDefinition { Name = "PC Engine Controller", - BoolButtons = Port1.Definition.BoolButtons - .Concat(Port2.Definition.BoolButtons) - .Concat(Port3.Definition.BoolButtons) - .Concat(Port4.Definition.BoolButtons) - .Concat(Port5.Definition.BoolButtons) + BoolButtons = _port1.Definition.BoolButtons + .Concat(_port2.Definition.BoolButtons) + .Concat(_port3.Definition.BoolButtons) + .Concat(_port4.Definition.BoolButtons) + .Concat(_port5.Definition.BoolButtons) .ToList() }; - Definition.FloatControls.AddRange(Port1.Definition.FloatControls); - Definition.FloatControls.AddRange(Port2.Definition.FloatControls); - Definition.FloatControls.AddRange(Port3.Definition.FloatControls); - Definition.FloatControls.AddRange(Port4.Definition.FloatControls); - Definition.FloatControls.AddRange(Port5.Definition.FloatControls); + Definition.FloatControls.AddRange(_port1.Definition.FloatControls); + Definition.FloatControls.AddRange(_port2.Definition.FloatControls); + Definition.FloatControls.AddRange(_port3.Definition.FloatControls); + Definition.FloatControls.AddRange(_port4.Definition.FloatControls); + Definition.FloatControls.AddRange(_port5.Definition.FloatControls); - Definition.FloatRanges.AddRange(Port1.Definition.FloatRanges); - Definition.FloatRanges.AddRange(Port2.Definition.FloatRanges); - Definition.FloatRanges.AddRange(Port3.Definition.FloatRanges); - Definition.FloatRanges.AddRange(Port4.Definition.FloatRanges); - Definition.FloatRanges.AddRange(Port5.Definition.FloatRanges); + Definition.FloatRanges.AddRange(_port1.Definition.FloatRanges); + Definition.FloatRanges.AddRange(_port2.Definition.FloatRanges); + Definition.FloatRanges.AddRange(_port3.Definition.FloatRanges); + Definition.FloatRanges.AddRange(_port4.Definition.FloatRanges); + Definition.FloatRanges.AddRange(_port5.Definition.FloatRanges); } - private readonly IPort Port1; - private readonly IPort Port2; - private readonly IPort Port3; - private readonly IPort Port4; - private readonly IPort Port5; + private readonly IPort _port1; + private readonly IPort _port2; + private readonly IPort _port3; + private readonly IPort _port4; + private readonly IPort _port5; public byte Read(int portNum, IController c, bool sel) { @@ -70,15 +70,15 @@ namespace BizHawk.Emulation.Cores.PCEngine default: throw new ArgumentException($"Invalid {nameof(portNum)}: {portNum}"); case 1: - return Port1.Read(c, sel); + return _port1.Read(c, sel); case 2: - return Port2.Read(c, sel); + return _port2.Read(c, sel); case 3: - return Port3.Read(c, sel); + return _port3.Read(c, sel); case 4: - return Port4.Read(c, sel); + return _port4.Read(c, sel); case 5: - return Port5.Read(c, sel); + return _port5.Read(c, sel); } }