Clean up use of existing CoreNames consts

This commit is contained in:
YoshiRulz 2021-04-09 13:58:07 +10:00
parent 48bb5c24e6
commit fb1d507220
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
6 changed files with 25 additions and 21 deletions

View File

@ -949,7 +949,7 @@ namespace BizHawk.Client.EmuHawk
// LoadedCoreNameMenuItem
//
this.LoadedCoreNameMenuItem.Enabled = false;
this.LoadedCoreNameMenuItem.Text = "Loaded core: NullHawk (NULL)";
this.LoadedCoreNameMenuItem.Text = "Loaded core: <core name> (sysID)";
//
// ViewSubMenu
//
@ -2164,7 +2164,7 @@ namespace BizHawk.Client.EmuHawk
//
// CoreNameStatusBarButton
//
this.CoreNameStatusBarButton.Text = "Neshawk";
this.CoreNameStatusBarButton.Text = "<core name>";
//
// ProfileFirstBootLabel
//

View File

@ -3,6 +3,7 @@
using BizHawk.Emulation.Common;
using BizHawk.Client.Common;
using BizHawk.Client.Common.cheats;
using BizHawk.Emulation.Cores;
// TODO:
// Add Support/Handling for The Following Systems and Devices:
@ -11,7 +12,10 @@ using BizHawk.Client.Common.cheats;
// SNES: GoldFinger (Action Replay II) Support?
namespace BizHawk.Client.EmuHawk
{
[Tool(true, new[] { "GB", "GBA", "GEN", "N64", "NES", "PSX", "SAT", "SMS", "SNES" }, new[] { "Snes9x" })]
[Tool(
released: true,
supportedSystems: new[] { "GB", "GBA", "GEN", "N64", "NES", "PSX", "SAT", "SMS", "SNES" },
unsupportedCores: new[] { CoreNames.Snes9X })]
public partial class GameShark : ToolFormBase, IToolFormAutoConfig
{
[RequiredService]

View File

@ -4,7 +4,7 @@ using BizHawk.Emulation.Cores.Waterbox;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Faust
{
[Core("Faust", "Mednafen Team", true, true, "1.26.1", "https://mednafen.github.io/releases/", false)]
[Core(CoreNames.Faust, "Mednafen Team", true, true, "1.26.1", "https://mednafen.github.io/releases/", false)]
public class Faust : NymaCore, IRegionable
{
[CoreConstructor("SNES")]

View File

@ -3,7 +3,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
{
[Core("GBHawkLink", "", isPorted: false, isReleased: true)]
[Core(CoreNames.GBHawkLink, "", isPorted: false, isReleased: true)]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public partial class GBHawkLink : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, ILinkable,
ISettable<GBHawkLink.GBLinkSettings, GBHawkLink.GBLinkSyncSettings>

View File

@ -4,7 +4,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{
[Core(
"DualGambatte",
CoreNames.DualGambatte,
"sinamas/natt",
isPorted: true,
isReleased: true)]

View File

@ -8,23 +8,23 @@ namespace BizHawk.Emulation.Cores
/// </summary>
public static class CoreNames
{
public const string NesHawk = "NesHawk";
public const string SubNesHawk = "SubNESHawk";
public const string QuickNes = "QuickNes";
public const string Snes9X = "Snes9x";
public const string Bsnes = "BSNES";
public const string Mgba = "mGBA";
public const string GbHawk = "GBHawk";
public const string Gambatte = "Gambatte";
public const string SubGbHawk = "SubGBHawk";
public const string SameBoy = "SameBoy";
public const string PicoDrive = "PicoDrive";
public const string Gpgx = "Genplus-gx";
public const string PceHawk = "PCEHawk";
public const string TurboNyma = "TurboNyma";
public const string HyperNyma = "HyperNyma";
public const string Faust = "Faust";
public const string DualGambatte = "DualGambatte";
public const string Faust = "Faust";
public const string Gambatte = "Gambatte";
public const string GbHawk = "GBHawk";
public const string GBHawkLink = "GBHawkLink";
public const string Gpgx = "Genplus-gx";
public const string HyperNyma = "HyperNyma";
public const string Mgba = "mGBA";
public const string NesHawk = "NesHawk";
public const string PceHawk = "PCEHawk";
public const string PicoDrive = "PicoDrive";
public const string QuickNes = "QuickNes";
public const string SameBoy = "SameBoy";
public const string Snes9X = "Snes9x";
public const string SubGbHawk = "SubGBHawk";
public const string SubNesHawk = "SubNESHawk";
public const string TurboNyma = "TurboNyma";
}
}