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

simplify MapperPropAttribute

This commit is contained in:
adelikat 2020-03-19 21:12:23 -05:00
parent 291275fe8c
commit dc56dd87e8
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MapperPropAttribute.cs
View File

@ -7,17 +7,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
[AttributeUsage(AttributeTargets.Field)]
public sealed class MapperPropAttribute : Attribute
{
public string Name { get; }
public MapperPropAttribute(string name)
{
Name = name;
}
public MapperPropAttribute()
{
Name = null;
}
}
internal static class AutoMapperProps
@ -29,8 +18,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
var attrib = field.GetCustomAttributes(typeof(MapperPropAttribute), false).OfType<MapperPropAttribute>().SingleOrDefault();
if (attrib == null)
{
continue;
string name = attrib.Name ?? field.Name;
}
string name = field.Name;
if (!settings.BoardProperties.ContainsKey(name))
{
settings.BoardProperties.Add(name, (string)Convert.ChangeType(field.GetValue(board), typeof(string)));
@ -46,15 +38,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
var attribs = field.GetCustomAttributes(false);
foreach (var attrib in attribs)
{
if (attrib is MapperPropAttribute mapperProp)
if (attrib is MapperPropAttribute)
{
string name = mapperProp.Name ?? field.Name;
string name = field.Name;
if (board.InitialRegisterValues.TryGetValue(name, out var Value))
if (board.InitialRegisterValues.TryGetValue(name, out var value))
{
try
{
field.SetValue(board, Convert.ChangeType(Value, field.FieldType));
field.SetValue(board, Convert.ChangeType(value, field.FieldType));
}
catch (Exception e) when (e is InvalidCastException || e is FormatException || e is OverflowException)
{