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

Simplify some core name shenanigans with an extension method

This commit is contained in:
adelikat 2020-03-15 18:18:00 -05:00
parent f655a4587e
commit 4152dce1ca
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -461,8 +461,8 @@ namespace BizHawk.Client.Common
if (!record && emulator.SystemId == "NES") // For NES we need special logic since the movie will drive which core to load
{
var quicknesName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(QuickNES), typeof(CoreAttribute))).CoreName;
var neshawkName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(NES), typeof(CoreAttribute))).CoreName;
var quicknesName = typeof(QuickNES).CoreName();
var neshawkName = typeof(NES).CoreName();
// If either is specified use that, else use whatever is currently set
if (movie.Core == quicknesName)
@ -478,10 +478,10 @@ namespace BizHawk.Client.Common
}
else if (!record && emulator.SystemId == "SNES") // ditto with snes9x vs bsnes
{
var snes9xName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(Snes9x), typeof(CoreAttribute))).CoreName;
var bsnesName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(LibsnesCore), typeof(CoreAttribute))).CoreName;
var snes9XName = typeof(Snes9x).CoreName();
var bsnesName = typeof(LibsnesCore).CoreName();
if (movie.Core == snes9xName)
if (movie.Core == snes9XName)
{
PreviousSnesInSnes9x = Global.Config.SnesInSnes9x;
Global.Config.SnesInSnes9x = true;
@ -494,8 +494,8 @@ namespace BizHawk.Client.Common
}
else if (!record && emulator.SystemId == "GBA") // ditto with GBA, we should probably architect this at some point, this isn't sustainable
{
var mGBAName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(MGBAHawk), typeof(CoreAttribute))).CoreName;
var vbaNextName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(VBANext), typeof(CoreAttribute))).CoreName;
var mGBAName = typeof(MGBAHawk).CoreName();
var vbaNextName = typeof(VBANext).CoreName();
if (movie.Core == mGBAName)
{
@ -510,8 +510,8 @@ namespace BizHawk.Client.Common
}
else if (!record && (emulator.SystemId == "GB" || emulator.SystemId == "GBC"))
{
var gbHawkName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(GBHawk), typeof(CoreAttribute))).CoreName;
var gambatteName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(Gameboy), typeof(CoreAttribute))).CoreName;
var gbHawkName = typeof(GBHawk).CoreName();
var gambatteName = typeof(Gameboy).CoreName();
if (movie.Core == gbHawkName)
{

13
BizHawk.Emulation.Common/Extensions.cs
View File

@ -293,7 +293,18 @@ namespace BizHawk.Emulation.Common
return core.VsyncNumerator() / (double)core.VsyncDenominator();
}
// TODO: a better place for this
// TODO: a better place for these
public static string CoreName(this Type type)
{
if (type == null)
{
return "";
}
var attr = (CoreAttribute)Attribute.GetCustomAttribute(type, typeof(CoreAttribute));
return attr?.CoreName ?? "";
}
public static bool IsImplemented(this MethodInfo info)
{
return !info.GetCustomAttributes(false).Any(a => a is FeatureNotImplementedAttribute);