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

remove COreForcingViaGameDb user option. We should not give the user the ability to turn this off. If they are power users and want to overright our db, they can mod the db entries

This commit is contained in:
adelikat 2020-06-04 12:46:06 -05:00
parent d86aabb8b5
commit dba9de4f29
4 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/BizHawk.Client.Common/RomLoader.cs
View File

@ -895,17 +895,15 @@ namespace BizHawk.Client.Common
case "SNES":
{
var name = Global.Config.PreferredCores["SNES"];
if (Global.Config.CoreForcingViaGameDb)
{
if (game.ForcedCore.ToLower() == "snes9x")
{
name = CoreNames.Snes9X;
}
else if (game.ForcedCore.ToLower() == "bsnes")
{
name = CoreNames.Bsnes;
}
if (game.ForcedCore.ToLower() == "snes9x")
{
name = CoreNames.Snes9X;
}
else if (game.ForcedCore.ToLower() == "bsnes")
{
name = CoreNames.Bsnes;
}
try
{
core = CoreInventory.Instance["SNES", name];
@ -927,7 +925,7 @@ namespace BizHawk.Client.Common
string preference = Global.Config.PreferredCores["NES"];
// if user has saw fit to override in gamedb, apply that
if (Global.Config.CoreForcingViaGameDb && !string.IsNullOrEmpty(game.ForcedCore))
if (!string.IsNullOrEmpty(game.ForcedCore))
{
preference = game.ForcedCore.ToLower() switch
{
@ -995,7 +993,7 @@ namespace BizHawk.Client.Common
rom.GameInfo.Name = gameName;
break;
case "GEN":
if (Global.Config.CoreForcingViaGameDb && game.ForcedCore?.ToLower() == "pico")
if (game.ForcedCore?.ToLower() == "pico")
{
core = CoreInventory.Instance["GEN", CoreNames.PicoDrive];
}

1
src/BizHawk.Client.Common/config/Config.cs
View File

@ -301,7 +301,6 @@ namespace BizHawk.Client.Common
// it hasn't been absorbed into the new system
public bool GbAsSgb { get; set; }
public bool SgbUseBsnes { get; set; }
public bool CoreForcingViaGameDb { get; set; } = true;
public string LibretroCore { get; set; }
public Dictionary<string, string> PreferredCores = new Dictionary<string, string>

18
src/BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -202,8 +202,6 @@
this.GBGBHawkMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem16 = new System.Windows.Forms.ToolStripSeparator();
this.AllowGameDbCoreOverridesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.N64VideoPluginSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.setLibretroCoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
@ -1795,8 +1793,6 @@
this.PceCoreSubmenu,
this.GBInSGBMenuItem,
this.toolStripMenuItem16,
this.AllowGameDbCoreOverridesMenuItem,
this.toolStripSeparator8,
this.N64VideoPluginSettingsMenuItem,
this.setLibretroCoreToolStripMenuItem});
this.CoresSubMenu.Name = "CoresSubMenu";
@ -1959,18 +1955,6 @@
this.toolStripMenuItem16.Name = "toolStripMenuItem16";
this.toolStripMenuItem16.Size = new System.Drawing.Size(220, 6);
//
// allowGameDBCoreOverridesToolStripMenuItem
//
this.AllowGameDbCoreOverridesMenuItem.Name = "AllowGameDbCoreOverridesMenuItem";
this.AllowGameDbCoreOverridesMenuItem.Size = new System.Drawing.Size(223, 22);
this.AllowGameDbCoreOverridesMenuItem.Text = "Follow GameDB Core Overrides";
this.AllowGameDbCoreOverridesMenuItem.Click += new System.EventHandler(this.AllowGameDBCoreOverridesMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(220, 6);
//
// N64VideoPluginSettingsMenuItem
//
this.N64VideoPluginSettingsMenuItem.Name = "N64VideoPluginSettingsMenuItem";
@ -4229,7 +4213,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator30;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem66;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem67;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStripMenuItem N64VideoPluginSettingsMenuItem;
private System.Windows.Forms.ToolStripMenuItem ClientOptionsMenuItem;
private System.Windows.Forms.ToolStripMenuItem customizeToolStripMenuItem;
@ -4319,7 +4302,6 @@
private System.Windows.Forms.ToolStripMenuItem CoreSNESSubMenu;
private System.Windows.Forms.ToolStripMenuItem CorebsnesMenuItem;
private System.Windows.Forms.ToolStripMenuItem Coresnes9xMenuItem;
private System.Windows.Forms.ToolStripMenuItem AllowGameDbCoreOverridesMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem16;
private System.Windows.Forms.ToolStripMenuItem IntvSubMenu;
private System.Windows.Forms.ToolStripMenuItem IntVControllerSettingsMenuItem;

6
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1186,7 +1186,6 @@ namespace BizHawk.Client.EmuHawk
private void CoresSubMenu_DropDownOpened(object sender, EventArgs e)
{
GBInSGBMenuItem.Checked = Config.GbAsSgb;
AllowGameDbCoreOverridesMenuItem.Checked = Config.CoreForcingViaGameDb;
}
private void NesCoreSubMenu_DropDownOpened(object sender, EventArgs e)
@ -1337,11 +1336,6 @@ namespace BizHawk.Client.EmuHawk
}
}
private void AllowGameDBCoreOverridesMenuItem_Click(object sender, EventArgs e)
{
Config.CoreForcingViaGameDb ^= true;
}
private void N64VideoPluginSettingsMenuItem_Click(object sender, EventArgs e)
{
N64PluginSettingsMenuItem_Click(sender, e);