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

play around in romloader to replace some snes hackery with slightly different snes hackery

This commit is contained in:
nattthebear 2020-06-04 12:45:36 -04:00
parent 7792eb2e80
commit e798fb2b29
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -893,26 +893,24 @@ namespace BizHawk.Client.Common
break;
case "SNES":
bool useSnes9x = Global.Config.PreferredCores["SNES"] == CoreNames.Snes9X;
if (Global.Config.CoreForcingViaGameDb && !string.IsNullOrEmpty(game.ForcedCore))
{
{
var name = Global.Config.PreferredCores["SNES"];
if (Global.Config.CoreForcingViaGameDb)
{
if (game.ForcedCore.ToLower() == "snes9x")
{
useSnes9x = true;
name = CoreNames.Snes9X;
}
else if (game.ForcedCore.ToLower() == "bsnes")
{
useSnes9x = false;
name = CoreNames.Bsnes;
}
}
if (useSnes9x)
try
{
// TODO
// core = CoreInventory.Instance["SNES", "Faust"];
core = CoreInventory.Instance["SNES", CoreNames.Snes9X];
core = CoreInventory.Instance["SNES", name];
}
else
catch // TODO: CoreInventory should support some sort of trygetvalue
{
// need to get rid of this hack at some point
var basePath = Path.GetDirectoryName(path.Replace("|", "")); // Dirty hack to get around archive filenames (since we are just getting the directory path, it is safe to mangle the filename
@ -921,8 +919,8 @@ namespace BizHawk.Client.Common
var snes = new LibsnesCore(game, romData, xmlData, basePath, nextComm, GetCoreSettings<LibsnesCore>(), GetCoreSyncSettings<LibsnesCore>());
nextEmulator = snes;
}
break;
}
case "NES":
{
// apply main spur-of-the-moment switcheroo as lowest priority