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

Cleanup usages of FirmwareID fields

This commit is contained in:
YoshiRulz 2021-02-23 02:20:27 +10:00
parent eee4915ddd
commit 4103a8bab2
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Client.Common/CoreFileProvider.cs
View File

@ -40,13 +40,13 @@ namespace BizHawk.Client.Common
{
if (required)
{
var fullMsg = $"Couldn't find required firmware \"{id.System}:{id.Firmware}\". This is fatal{(msg != null ? $": {msg}" : ".")}";
var fullMsg = $"Couldn't find required firmware {id}. This is fatal{(msg != null ? $": {msg}" : ".")}";
throw new MissingFirmwareException(fullMsg);
}
if (msg != null)
{
var fullMsg = $"Couldn't find firmware \"{id.System}:{id.Firmware}\". Will attempt to continue: {msg}";
var fullMsg = $"Couldn't find firmware {id}. Will attempt to continue: {msg}";
_showWarning(fullMsg);
}
}

3
src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
View File

@ -239,8 +239,7 @@ namespace BizHawk.Client.Common
{
foreach (var firmware in firmwareManager.RecentlyServed)
{
var key = $"{firmware.ID.System}_Firmware_{firmware.ID.Firmware}";
var key = firmware.ID.MovieHeaderKey;
if (!movie.HeaderEntries.ContainsKey(key))
{
movie.HeaderEntries.Add(key, firmware.Hash);

15
src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -172,6 +172,7 @@ namespace BizHawk.Client.EmuHawk
var groups = new Dictionary<string, ListViewGroup>();
foreach (var fr in FirmwareDatabase.FirmwareRecords)
{
var sysID = fr.ID.System;
var lvi = new ListViewItem
{
Tag = fr,
@ -179,7 +180,7 @@ namespace BizHawk.Client.EmuHawk
ImageIndex = IdUnsure,
ToolTipText = null
};
lvi.SubItems.Add(fr.ID.System);
lvi.SubItems.Add(sysID);
lvi.SubItems.Add(fr.ID.Firmware);
lvi.SubItems.Add(fr.Description);
lvi.SubItems.Add(""); // resolved with
@ -191,15 +192,15 @@ namespace BizHawk.Client.EmuHawk
lvFirmwares.Items.Add(lvi);
// build the groups in the ListView as we go:
if (!groups.ContainsKey(fr.ID.System))
if (!groups.ContainsKey(sysID))
{
if (!SystemGroupNames.TryGetValue(fr.ID.System, out var name))
if (!SystemGroupNames.TryGetValue(sysID, out var name))
name = "FIX ME (FirmwaresConfig.cs)";
lvFirmwares.Groups.Add(fr.ID.System, name);
lvFirmwares.Groups.Add(sysID, name);
var lvg = lvFirmwares.Groups[lvFirmwares.Groups.Count - 1];
groups[fr.ID.System] = lvg;
groups[sysID] = lvg;
}
lvi.Group = groups[fr.ID.System];
lvi.Group = groups[sysID];
}
// now that we have some items in the ListView, we can size some columns to sensible widths
@ -533,7 +534,7 @@ namespace BizHawk.Client.EmuHawk
{
lblFirmware =
{
Text = $"{fr.ID.System} : {fr.ID.Firmware} ({fr.Description})"
Text = $"{fr.ID} ({fr.Description})"
}
};

2
src/BizHawk.Emulation.Common/Database/FirmwareID.cs
View File

@ -12,6 +12,8 @@ namespace BizHawk.Emulation.Common
public readonly string Firmware;
public string MovieHeaderKey => $"{System}_Firmware_{Firmware}";
public readonly string System;
public FirmwareID(string system, string firmware)