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

Restore PS2 sysID and add some others from RomLoader

This commit is contained in:
YoshiRulz 2022-08-06 08:46:43 +10:00
parent 5cd37c76b2
commit 8f153fd503
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
4 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/BizHawk.Client.Common/RomLoader.cs
View File

@ -242,6 +242,12 @@ namespace BizHawk.Client.Common
{
// try to use our wizard methods
game = new GameInfo { Name = name, Hash = discHash };
Exception NoCoreForSystem(string sysID)
{
// no supported emulator core for these (yet)
game.System = sysID;
return new NoAvailableCoreException(sysID);
}
switch (discType)
{
@ -261,18 +267,25 @@ namespace BizHawk.Client.Common
break;
case DiscType.Amiga:
throw NoCoreForSystem(VSystemID.Raw.Amiga);
case DiscType.CDi:
throw NoCoreForSystem(VSystemID.Raw.PhillipsCDi);
case DiscType.Dreamcast:
throw NoCoreForSystem(VSystemID.Raw.Dreamcast);
case DiscType.GameCube:
throw NoCoreForSystem(VSystemID.Raw.GameCube);
case DiscType.NeoGeoCD:
throw NoCoreForSystem(VSystemID.Raw.NeoGeoCD);
case DiscType.Panasonic3DO:
throw NoCoreForSystem(VSystemID.Raw.Panasonic3DO);
case DiscType.Playdia:
throw NoCoreForSystem(VSystemID.Raw.Playdia);
case DiscType.SonyPS2:
throw NoCoreForSystem(VSystemID.Raw.PS2);
case DiscType.SonyPSP:
throw NoCoreForSystem(VSystemID.Raw.PSP);
case DiscType.Wii:
// no supported emulator core for these (yet)
game.System = discType.ToString();
throw new NoAvailableCoreException(discType.ToString());
throw NoCoreForSystem(VSystemID.Raw.Wii);
case DiscType.AudioDisc:
case DiscType.UnknownCDFS:

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

@ -86,6 +86,7 @@ namespace BizHawk.Client.EmuHawk
["ChannelF"] = "Channel F",
["VEC"] = "Vectrex",
["MSX"] = "MSX",
// ["PS2"] = "Sony PlayStation 2",
};
public string TargetSystem { get; set; }

1
src/BizHawk.Emulation.Common/Extensions.cs
View File

@ -48,6 +48,7 @@ namespace BizHawk.Emulation.Common
[VSystemID.Raw.PCE] = "TurboGrafx-16",
[VSystemID.Raw.PCECD] = "TurboGrafx - 16(CD)",
[VSystemID.Raw.PCFX] = "PCFX",
[VSystemID.Raw.PS2] = "PlayStation 2",
[VSystemID.Raw.PSX] = "PlayStation",
[VSystemID.Raw.SAT] = "Saturn",
[VSystemID.Raw.Sega32X] = "Genesis 32X",

10
src/BizHawk.Emulation.Common/VSystemID.cs
View File

@ -14,12 +14,15 @@ namespace BizHawk.Emulation.Common
{
public const string A26 = "A26";
public const string A78 = "A78";
public const string Amiga = "Amiga";
public const string AmstradCPC = "AmstradCPC";
public const string AppleII = "AppleII";
public const string C64 = "C64";
public const string ChannelF = "ChannelF";
public const string Coleco = "Coleco";
public const string DEBUG = "DEBUG";
public const string Dreamcast = "Dreamcast";
public const string GameCube = "GameCube";
public const string GB = "GB";
public const string GBA = "GBA";
public const string GBC = "GBC";
@ -34,13 +37,19 @@ namespace BizHawk.Emulation.Common
public const string MSX = "MSX";
public const string N64 = "N64";
public const string NDS = "NDS";
public const string NeoGeoCD = "NeoGeoCD";
public const string NES = "NES";
public const string NGP = "NGP";
public const string NULL = "NULL";
public const string O2 = "O2";
public const string Panasonic3DO = "Panasonic3DO";
public const string PCE = "PCE";
public const string PCECD = "PCECD";
public const string PCFX = "PCFX";
public const string PhillipsCDi = "PhillipsCDi";
public const string Playdia = "Playdia";
public const string PS2 = "PS2";
public const string PSP = "PSP";
public const string PSX = "PSX";
public const string SAT = "SAT";
public const string Sega32X = "32X";
@ -55,6 +64,7 @@ namespace BizHawk.Emulation.Common
public const string UZE = "UZE";
public const string VB = "VB";
public const string VEC = "VEC";
public const string Wii = "Wii";
public const string WSWAN = "WSWAN";
public const string ZXSpectrum = "ZXSpectrum";
}