Hook up N64 to circular analog constraint, put in config, on by default. Still todo: UI for the user to modify this variable

This commit is contained in:
adelikat 2014-05-17 20:02:10 +00:00
parent 0588c3d7ea
commit 4fa6b94c1d
2 changed files with 6 additions and 2 deletions

View File

@ -97,6 +97,9 @@ namespace BizHawk.Client.Common
public enum SaveStateTypeE { Default, Binary, Text };
public SaveStateTypeE SaveStateType = SaveStateTypeE.Default;
// N64
public bool N64UseCircularAnalogConstraint = true;
// Run-Control settings
public int FrameProgressDelayMs = 500; // how long until a frame advance hold turns into a frame progress?
public int FrameSkip = 4;

View File

@ -24,6 +24,7 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem;
using BizHawk.Emulation.Cores.Sega.Saturn;
using BizHawk.Emulation.Cores.Sony.PSP;
using BizHawk.Emulation.DiscSystem;
using BizHawk.Emulation.Cores.Nintendo.N64;
namespace BizHawk.Client.EmuHawk
{
@ -430,8 +431,8 @@ namespace BizHawk.Client.EmuHawk
Global.ActiveController.LatchFromPhysical(Global.ControllerInputCoalescer);
//TODO - use preferences to apply this
Global.ActiveController.ApplyAxisConstraints("Natural Circle");
Global.ActiveController.ApplyAxisConstraints(
(Global.Emulator is N64 && Global.Config.N64UseCircularAnalogConstraint) ? "Natural Circle" : null);
Global.ActiveController.OR_FromLogical(Global.ClickyVirtualPadController);
Global.ActiveController.Overrides(Global.LuaAndAdaptor);