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

VirtualPad - use an IEmulator service and remove references to Global.Emulator

This commit is contained in:
adelikat 2015-01-01 19:15:32 +00:00
parent 5bba86e23a
commit bdae0c359b
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
View File

@ -5,12 +5,22 @@ using System.Linq;
using System.Reflection;
using System.Windows.Forms;
using BizHawk.Emulation.Common;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk
{
public partial class VirtualpadTool : Form, IToolFormAutoConfig
{
[RequiredService]
private IEmulator Emulator { get; set; }
[ConfigPersist]
public bool StickyPads { get; set; }
[ConfigPersist]
public bool ClearAlsoClearsAnalog { get; set; }
private bool _readOnly;
private List<VirtualPad> Pads
@ -37,13 +47,6 @@ namespace BizHawk.Client.EmuHawk
}
}
[ConfigPersist]
public bool StickyPads { get; set; }
[ConfigPersist]
public bool ClearAlsoClearsAnalog { get; set; }
public VirtualpadTool()
{
StickyPads = true;
@ -85,14 +88,14 @@ namespace BizHawk.Client.EmuHawk
.Any())
.FirstOrDefault(t => t.GetCustomAttributes(false)
.OfType<SchemaAttributes>()
.First().SystemId == Global.Emulator.SystemId);
.First().SystemId == Emulator.SystemId);
if (schemaType != null)
{
var padschemas = (Activator.CreateInstance(schemaType) as IVirtualPadSchema).GetPadSchemas();
if (VersionInfo.DeveloperBuild)
{
CheckPads(padschemas, Global.Emulator.ControllerDefinition);
CheckPads(padschemas, Emulator.ControllerDefinition);
}
var pads = padschemas.Select(s => new VirtualPad(s));