Skip to content

Commit dba9de4

Browse files
author
adelikat
committed
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
1 parent d86aabb commit dba9de4

File tree

4 files changed

+10
-37
lines changed

4 files changed

+10
-37
lines changed

src/BizHawk.Client.Common/RomLoader.cs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -895,17 +895,15 @@ public bool LoadRom(string path, CoreComm nextComm, string launchLibretroCore, b
895895
case "SNES":
896896
{
897897
var name = Global.Config.PreferredCores["SNES"];
898-
if (Global.Config.CoreForcingViaGameDb)
899-
{
900-
if (game.ForcedCore.ToLower() == "snes9x")
901-
{
902-
name = CoreNames.Snes9X;
903-
}
904-
else if (game.ForcedCore.ToLower() == "bsnes")
905-
{
906-
name = CoreNames.Bsnes;
907-
}
898+
if (game.ForcedCore.ToLower() == "snes9x")
899+
{
900+
name = CoreNames.Snes9X;
901+
}
902+
else if (game.ForcedCore.ToLower() == "bsnes")
903+
{
904+
name = CoreNames.Bsnes;
908905
}
906+
909907
try
910908
{
911909
core = CoreInventory.Instance["SNES", name];
@@ -927,7 +925,7 @@ public bool LoadRom(string path, CoreComm nextComm, string launchLibretroCore, b
927925
string preference = Global.Config.PreferredCores["NES"];
928926

929927
// if user has saw fit to override in gamedb, apply that
930-
if (Global.Config.CoreForcingViaGameDb && !string.IsNullOrEmpty(game.ForcedCore))
928+
if (!string.IsNullOrEmpty(game.ForcedCore))
931929
{
932930
preference = game.ForcedCore.ToLower() switch
933931
{
@@ -995,7 +993,7 @@ public bool LoadRom(string path, CoreComm nextComm, string launchLibretroCore, b
995993
rom.GameInfo.Name = gameName;
996994
break;
997995
case "GEN":
998-
if (Global.Config.CoreForcingViaGameDb && game.ForcedCore?.ToLower() == "pico")
996+
if (game.ForcedCore?.ToLower() == "pico")
999997
{
1000998
core = CoreInventory.Instance["GEN", CoreNames.PicoDrive];
1001999
}

src/BizHawk.Client.Common/config/Config.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ private static bool DetectDirectX()
301301
// it hasn't been absorbed into the new system
302302
public bool GbAsSgb { get; set; }
303303
public bool SgbUseBsnes { get; set; }
304-
public bool CoreForcingViaGameDb { get; set; } = true;
305304
public string LibretroCore { get; set; }
306305

307306
public Dictionary<string, string> PreferredCores = new Dictionary<string, string>

src/BizHawk.Client.EmuHawk/MainForm.Designer.cs

Lines changed: 0 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/BizHawk.Client.EmuHawk/MainForm.Events.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,6 @@ private void HkOverInputMenuItem_Click(object sender, EventArgs e)
11861186
private void CoresSubMenu_DropDownOpened(object sender, EventArgs e)
11871187
{
11881188
GBInSGBMenuItem.Checked = Config.GbAsSgb;
1189-
AllowGameDbCoreOverridesMenuItem.Checked = Config.CoreForcingViaGameDb;
11901189
}
11911190

11921191
private void NesCoreSubMenu_DropDownOpened(object sender, EventArgs e)
@@ -1337,11 +1336,6 @@ private void GbInSgbMenuItem_Click(object sender, EventArgs e)
13371336
}
13381337
}
13391338

1340-
private void AllowGameDBCoreOverridesMenuItem_Click(object sender, EventArgs e)
1341-
{
1342-
Config.CoreForcingViaGameDb ^= true;
1343-
}
1344-
13451339
private void N64VideoPluginSettingsMenuItem_Click(object sender, EventArgs e)
13461340
{
13471341
N64PluginSettingsMenuItem_Click(sender, e);

0 commit comments

Comments
 (0)