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

Remove IEmuClientApi.RunningSystem from the API 

other code in EmuClientApi (the impl.) uses this prop, so it's staying for now
This commit is contained in:
YoshiRulz 2020-07-31 16:17:02 +10:00
parent 9b5997cf7f
commit b77cd9a7bf
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.Common/Api/Interfaces/IEmuClientApi.cs
View File

@ -7,8 +7,6 @@ namespace BizHawk.Client.Common
{ {
public interface IEmuClientApi : IExternalApi public interface IEmuClientApi : IExternalApi
{ {
SystemInfo RunningSystem { get; }
/// <summary> /// <summary>
/// Occurs before a quickload is done (just after user has pressed the shortcut button /// Occurs before a quickload is done (just after user has pressed the shortcut button
/// or has click on the item menu) /// or has click on the item menu)

3
src/BizHawk.Client.EmuHawk/Api/ClientApi.cs
View File

@ -8,9 +8,6 @@ namespace BizHawk.Client.EmuHawk
{ {
public static class ClientApi public static class ClientApi
{ {
/// <inheritdoc cref="IEmuClientApi.DoFrameAdvance"/>
public static SystemInfo RunningSystem => GlobalWin.ClientApi.RunningSystem;
/// <inheritdoc cref="IEmuClientApi.BeforeQuickLoad"/> /// <inheritdoc cref="IEmuClientApi.BeforeQuickLoad"/>
public static event BeforeQuickLoadEventHandler BeforeQuickLoad public static event BeforeQuickLoadEventHandler BeforeQuickLoad
{ {

5
src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs
View File

@ -39,7 +39,8 @@ namespace BizHawk.Client.EmuHawk
private readonly JoypadStringToEnumConverter JoypadConverter = new JoypadStringToEnumConverter(); private readonly JoypadStringToEnumConverter JoypadConverter = new JoypadStringToEnumConverter();
public SystemInfo RunningSystem /// <remarks>future humans: if this is broken, rewrite the caller instead if fixing it</remarks>
private SystemInfo RunningSystem
{ {
get get
{ {
@ -54,7 +55,7 @@ namespace BizHawk.Client.EmuHawk
_ => throw new ArgumentOutOfRangeException() _ => throw new ArgumentOutOfRangeException()
}; };
case "PCE": case "PCE":
return SystemInfo.PCE; // not always accurate, but anyone wanting accuracy has probably figured out how to use IEmu.GetSystemId() return SystemInfo.PCE;
case "SMS": case "SMS":
var sms = (SMS) Emulator; var sms = (SMS) Emulator;
return sms.IsSG1000 return sms.IsSG1000