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

Remove Global.NullControls

This commit is contained in:
adelikat 2015-02-22 20:38:10 +00:00
parent fe00e83f6c
commit be51677fde
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/Global.cs
View File

@ -26,7 +26,6 @@ namespace BizHawk.Client.Common
/// </summary> /// </summary>
public static int SoundMaxBufferDeficitMs; public static int SoundMaxBufferDeficitMs;
public static Controller NullControls;
public static AutofireController AutofireNullControls; public static AutofireController AutofireNullControls;
//the movie will be spliced inbetween these if it is present //the movie will be spliced inbetween these if it is present

5
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -274,7 +274,7 @@ namespace BizHawk.Client.EmuHawk
var comm = CreateCoreComm(); var comm = CreateCoreComm();
CoreFileProvider.SyncCoreCommInputSignals(comm); CoreFileProvider.SyncCoreCommInputSignals(comm);
Global.Emulator = new NullEmulator(comm, Global.Config.GetCoreSettings<NullEmulator>()); Global.Emulator = new NullEmulator(comm, Global.Config.GetCoreSettings<NullEmulator>());
Global.ActiveController = Global.NullControls; Global.ActiveController = new Controller(NullEmulator.NullController);
Global.AutoFireController = Global.AutofireNullControls; Global.AutoFireController = Global.AutofireNullControls;
Global.AutofireStickyXORAdapter.SetOnOffPatternFromConfig(); Global.AutofireStickyXORAdapter.SetOnOffPatternFromConfig();
try { GlobalWin.Sound = new Sound(Handle); } try { GlobalWin.Sound = new Sound(Handle); }
@ -1605,7 +1605,6 @@ namespace BizHawk.Client.EmuHawk
} }
Global.ClientControls = controls; Global.ClientControls = controls;
Global.NullControls = new Controller(NullEmulator.NullController);
Global.AutofireNullControls = new AutofireController(NullEmulator.NullController, Global.Emulator); Global.AutofireNullControls = new AutofireController(NullEmulator.NullController, Global.Emulator);
} }
@ -3498,7 +3497,7 @@ namespace BizHawk.Client.EmuHawk
var coreComm = CreateCoreComm(); var coreComm = CreateCoreComm();
CoreFileProvider.SyncCoreCommInputSignals(coreComm); CoreFileProvider.SyncCoreCommInputSignals(coreComm);
Global.Emulator = new NullEmulator(coreComm, Global.Config.GetCoreSettings<NullEmulator>()); Global.Emulator = new NullEmulator(coreComm, Global.Config.GetCoreSettings<NullEmulator>());
Global.ActiveController = Global.NullControls; Global.ActiveController = new Controller(NullEmulator.NullController);
Global.AutoFireController = Global.AutofireNullControls; Global.AutoFireController = Global.AutofireNullControls;
RewireSound(); RewireSound();
RebootStatusBarIcon.Visible = false; RebootStatusBarIcon.Visible = false;