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

profile config cleanup

This commit is contained in:
adelikat 2019-12-16 19:45:03 -06:00
parent dc26b67446
commit cf647ffd04
2 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
BizHawk.Client.EmuHawk/config/ProfileConfig.cs
View File

@ -6,8 +6,6 @@ using BizHawk.Client.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Nintendo.N64; 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.Consoles.Sega.gpgx;
using BizHawk.Emulation.Cores.Sega.MasterSystem; using BizHawk.Emulation.Cores.Sega.MasterSystem;
using BizHawk.Emulation.Cores.ColecoVision; using BizHawk.Emulation.Cores.ColecoVision;
@ -87,7 +85,6 @@ namespace BizHawk.Client.EmuHawk
// N64 // N64
var n64Settings = GetSyncSettings<N64, N64SyncSettings>(); var n64Settings = GetSyncSettings<N64, N64SyncSettings>();
n64Settings.Rsp = N64SyncSettings.RspType.Rsp_Hle; n64Settings.Rsp = N64SyncSettings.RspType.Rsp_Hle;
//n64Settings.Core = N64SyncSettings.CoreType.Dynarec;
n64Settings.Core = N64SyncSettings.CoreType.Interpret; n64Settings.Core = N64SyncSettings.CoreType.Interpret;
Global.Config.N64UseCircularAnalogConstraint = true; Global.Config.N64UseCircularAnalogConstraint = true;
PutSyncSettings<N64>(n64Settings); PutSyncSettings<N64>(n64Settings);
@ -342,49 +339,18 @@ namespace BizHawk.Client.EmuHawk
where TEmulator : IEmulator where TEmulator : IEmulator
{ {
// should we complain if we get a successful object from the config file, but it is the wrong type? // 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); var settable = new SettingsAdapter(Global.Emulator);
if (settable.HasSyncSettings) if (settable.HasSyncSettings)
{ {
fromcore = settable.GetSyncSettings(); fromCore = settable.GetSyncSettings();
} }
return fromcore as TSetting return fromCore as TSetting
?? Global.Config.GetCoreSyncSettings<TEmulator>() as TSetting ?? Global.Config.GetCoreSyncSettings<TEmulator>() as TSetting
?? new TSetting(); // guaranteed to give sensible defaults ?? new TSetting(); // guaranteed to give sensible defaults
} }
private static TSetting GetSettings<TEmulator, TSetting>()
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<TEmulator>() as TSetting
?? new TSetting(); // guaranteed to give sensible defaults
}
private static void PutSettings<TEmulator>(object o)
where TEmulator : IEmulator
{
if (Global.Emulator is TEmulator)
{
var settable = new SettingsAdapter(Global.Emulator);
settable.PutSettings(o);
}
else
{
Global.Config.PutCoreSettings<TEmulator>(o);
}
}
private static void PutSyncSettings<TEmulator>(object o) private static void PutSyncSettings<TEmulator>(object o)
where TEmulator : IEmulator where TEmulator : IEmulator
{ {

3
BizHawk.sln.DotSettings
View File

@ -265,6 +265,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Loadstate/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Loadstate/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Loadstates/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Loadstates/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Longplay/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Longplay/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Longplays/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=lsmv/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=lsmv/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=LSNES/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=LSNES/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=luaf/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=luaf/@EntryIndexedValue">True</s:Boolean>
@ -320,6 +321,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Screensize/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Screensize/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=shaders/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=shaders/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=speccy/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=speccy/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Speedruns/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Sram/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Sram/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=sSeeki/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=sSeeki/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Statable/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Statable/@EntryIndexedValue">True</s:Boolean>
@ -339,6 +341,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Trollers/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Trollers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Turboing/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Turboing/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=tvalue/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=tvalue/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=UDLR/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Uninitialize/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Uninitialize/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unmerge/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=unmerge/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unpause/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=unpause/@EntryIndexedValue">True</s:Boolean>