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

System Info - Fix detection of GG and SG-1000

This commit is contained in:
adelikat 2014-05-31 23:17:39 +00:00
parent da1bc66c0e
commit 8231025b91
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.Client.Common/Global.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Sega.MasterSystem;
using BizHawk.Emulation.DiscSystem; using BizHawk.Emulation.DiscSystem;
namespace BizHawk.Client.Common namespace BizHawk.Client.Common
@ -105,9 +106,16 @@ namespace BizHawk.Client.Common
case "SG": case "SG":
return SystemInfo.SG; return SystemInfo.SG;
case "SMS": case "SMS":
if ((Global.Emulator as SMS).IsGameGear)
{
return SystemInfo.GG;
}
else if ((Global.Emulator as SMS).IsSG1000)
{
return SystemInfo.SG;
}
return SystemInfo.SMS; return SystemInfo.SMS;
case "GG":
return SystemInfo.GG;
case "PCECD": case "PCECD":
return SystemInfo.PCECD; return SystemInfo.PCECD;
case "PCE": case "PCE":

3
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
View File

@ -68,6 +68,8 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
public YM2413 YM2413; public YM2413 YM2413;
public SoundMixer SoundMixer; public SoundMixer SoundMixer;
public bool IsGameGear = false; public bool IsGameGear = false;
public bool IsSG1000 = false;
public bool HasYM2413 = false; public bool HasYM2413 = false;
int frame = 0; int frame = 0;
@ -95,6 +97,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
CoreComm = comm; CoreComm = comm;
IsGameGear = game.System == "GG"; IsGameGear = game.System == "GG";
IsSG1000 = game.System == "SG";
RomData = rom; RomData = rom;
CoreComm.CpuTraceAvailable = true; CoreComm.CpuTraceAvailable = true;