diff --git a/BizHawk.Client.EmuHawk/config/ProfileConfig.cs b/BizHawk.Client.EmuHawk/config/ProfileConfig.cs index ddbf3b8fc7..fb3c900aba 100644 --- a/BizHawk.Client.EmuHawk/config/ProfileConfig.cs +++ b/BizHawk.Client.EmuHawk/config/ProfileConfig.cs @@ -6,8 +6,6 @@ using BizHawk.Client.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Nintendo.N64; -using BizHawk.Emulation.Cores.Nintendo.SNES; -using BizHawk.Emulation.Cores.Sega.Saturn; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; using BizHawk.Emulation.Cores.Sega.MasterSystem; using BizHawk.Emulation.Cores.ColecoVision; @@ -87,7 +85,6 @@ namespace BizHawk.Client.EmuHawk // N64 var n64Settings = GetSyncSettings(); n64Settings.Rsp = N64SyncSettings.RspType.Rsp_Hle; - //n64Settings.Core = N64SyncSettings.CoreType.Dynarec; n64Settings.Core = N64SyncSettings.CoreType.Interpret; Global.Config.N64UseCircularAnalogConstraint = true; PutSyncSettings(n64Settings); @@ -342,49 +339,18 @@ namespace BizHawk.Client.EmuHawk where TEmulator : IEmulator { // should we complain if we get a successful object from the config file, but it is the wrong type? - object fromcore = null; + object fromCore = null; var settable = new SettingsAdapter(Global.Emulator); if (settable.HasSyncSettings) { - fromcore = settable.GetSyncSettings(); + fromCore = settable.GetSyncSettings(); } - return fromcore as TSetting + return fromCore as TSetting ?? Global.Config.GetCoreSyncSettings() as TSetting ?? new TSetting(); // guaranteed to give sensible defaults } - private static TSetting GetSettings() - where TSetting : class, new() - where TEmulator : IEmulator - { - // should we complain if we get a successful object from the config file, but it is the wrong type? - object fromcore = null; - var settable = new SettingsAdapter(Global.Emulator); - if (settable.HasSettings) - { - fromcore = settable.GetSettings(); - } - - return fromcore as TSetting - ?? Global.Config.GetCoreSettings() as TSetting - ?? new TSetting(); // guaranteed to give sensible defaults - } - - private static void PutSettings(object o) - where TEmulator : IEmulator - { - if (Global.Emulator is TEmulator) - { - var settable = new SettingsAdapter(Global.Emulator); - settable.PutSettings(o); - } - else - { - Global.Config.PutCoreSettings(o); - } - } - private static void PutSyncSettings(object o) where TEmulator : IEmulator { diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings index 33aa871fd0..be7bad37a4 100644 --- a/BizHawk.sln.DotSettings +++ b/BizHawk.sln.DotSettings @@ -265,6 +265,7 @@ True True True + True True True True @@ -320,6 +321,7 @@ True True True + True True True True @@ -339,6 +341,7 @@ True True True + True True True True