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

add GBC to core preferences, keep the ui as GB sets both, but this prepared for us to be able to set them separately

This commit is contained in:
adelikat 2020-06-02 17:04:42 -05:00
parent baa820c0e4
commit 2dda13cdd1
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,6 +313,7 @@ namespace BizHawk.Client.Common
["NES"] = CoreNames.QuickNes, ["NES"] = CoreNames.QuickNes,
["SNES"] = CoreNames.Snes9X, ["SNES"] = CoreNames.Snes9X,
["GB"] = CoreNames.Gambatte, ["GB"] = CoreNames.Gambatte,
["GBC"] = CoreNames.Gambatte,
["PCE"] = CoreNames.PceHawk, ["PCE"] = CoreNames.PceHawk,
["PCECD"] = CoreNames.PceHawk, ["PCECD"] = CoreNames.PceHawk,
["SGX"] = CoreNames.PceHawk ["SGX"] = CoreNames.PceHawk

17
src/BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -251,27 +251,20 @@ namespace BizHawk.Client.Common
if (!record) if (!record)
{ {
var preference = systemId; if (Global.Config.PreferredCores.ContainsKey(systemId))
if (preference == "GBC")
{ {
// We want to treat GBC the same as GB string movieCore = Global.Config.PreferredCores[systemId];
preference = "GB";
}
if (Global.Config.PreferredCores.ContainsKey(preference))
{
string movieCore = Global.Config.PreferredCores[preference];
if (string.IsNullOrWhiteSpace(movie.Core)) if (string.IsNullOrWhiteSpace(movie.Core))
{ {
PopupMessage($"No core specified in the movie file, using the preferred core {Global.Config.PreferredCores[preference]} instead."); PopupMessage($"No core specified in the movie file, using the preferred core {Global.Config.PreferredCores[systemId]} instead.");
} }
else else
{ {
movieCore = movie.Core; movieCore = movie.Core;
} }
_preferredCores[preference] = Global.Config.PreferredCores[preference]; _preferredCores[systemId] = Global.Config.PreferredCores[systemId];
Global.Config.PreferredCores[preference] = movieCore; Global.Config.PreferredCores[systemId] = movieCore;
} }
} }

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

@ -1284,6 +1284,7 @@ namespace BizHawk.Client.EmuHawk
private void GambatteCorePick_Click(object sender, EventArgs e) private void GambatteCorePick_Click(object sender, EventArgs e)
{ {
Config.PreferredCores["GB"] = CoreNames.Gambatte; Config.PreferredCores["GB"] = CoreNames.Gambatte;
Config.PreferredCores["GBC"] = CoreNames.Gambatte;
if (Emulator.SystemId == "GB" || Emulator.SystemId == "GBC") if (Emulator.SystemId == "GB" || Emulator.SystemId == "GBC")
{ {