From 5a0b49726e905f01b9b8ea544b53eb598855bc80 Mon Sep 17 00:00:00 2001 From: nattthebear Date: Sun, 9 Aug 2020 16:31:49 -0400 Subject: [PATCH] Revert "hack rom loader to keep doing the bullshit we've been doing for 8 years now, where Game.System == "GBC" results in an Emulator with a SystemID. Don't revert without volunteering to fix tasvideos" This reverts commit 31bf9b9147b1f44fea56d358529d7eda638c762d. --- src/BizHawk.Client.Common/RomLoader.cs | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs index c890c98bad..09a648a51d 100644 --- a/src/BizHawk.Client.Common/RomLoader.cs +++ b/src/BizHawk.Client.Common/RomLoader.cs @@ -333,23 +333,7 @@ namespace BizHawk.Client.Common private IEmulator MakeCoreFromCoreInventory(CoreInventoryParameters cip) { - var preferredSystem = cip.Game.System; - if (preferredSystem == "GBC") - { - preferredSystem = "GB"; - } - - if (preferredSystem.In("GG", "SG")) - { - preferredSystem = "SMS"; - } - - if (preferredSystem == "SGX") - { - preferredSystem = "PCE"; - } - - _config.PreferredCores.TryGetValue(preferredSystem, out var preferredCore); + _config.PreferredCores.TryGetValue(cip.Game.System, out var preferredCore); var forcedCore = cip.Game.ForcedCore; var cores = CoreInventory.Instance.GetCores(cip.Game.System) .OrderBy(c =>