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

Fix EmuClientApi not being registered and merge CloseEmulator()s 

fixes a74d657a2, 51a83193a
This commit is contained in:
YoshiRulz 2020-06-17 10:34:19 +10:00
parent c53bda9235
commit 9d1dfd71a1
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,9 +46,7 @@ namespace BizHawk.Client.Common
void ClearAutohold();
void CloseEmulator();
void CloseEmulatorWithCode(int exitCode);
void CloseEmulator(int? exitCode = null);
void CloseRom();

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

@ -64,8 +64,8 @@ namespace BizHawk.Client.EmuHawk
/// <inheritdoc cref="IEmuClientApi.CloseEmulator"/>
public static void CloseEmulator() => GlobalWin.ClientApi.CloseEmulator();
/// <inheritdoc cref="IEmuClientApi.CloseEmulatorWithCode"/>
public static void CloseEmulatorWithCode(int exitCode) => GlobalWin.ClientApi.CloseEmulatorWithCode(exitCode);
/// <inheritdoc cref="IEmuClientApi.CloseEmulator"/>
public static void CloseEmulatorWithCode(int exitCode) => GlobalWin.ClientApi.CloseEmulator(exitCode);
/// <inheritdoc cref="IEmuClientApi.CloseRom"/>
public static void CloseRom() => GlobalWin.ClientApi.CloseRom();

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

@ -15,7 +15,7 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem;
namespace BizHawk.Client.EmuHawk
{
public class EmuClientApi : IEmuClientApi
public sealed class EmuClientApi : IEmuClientApi
{
private List<Joypad> _allJoyPads;
@ -106,9 +106,7 @@ namespace BizHawk.Client.EmuHawk
public void ClearAutohold() => _mainForm.ClearHolds();
public void CloseEmulator() => _mainForm.CloseEmulator();
public void CloseEmulatorWithCode(int exitCode) => _mainForm.CloseEmulator(exitCode);
public void CloseEmulator(int? exitCode = null) => _mainForm.CloseEmulator(exitCode);
public void CloseRom() => _mainForm.CloseRom();

2
src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs
View File

@ -40,7 +40,7 @@ namespace BizHawk.Client.EmuHawk
[LuaMethodExample("client.exitCode( 0 );")]
[LuaMethod("exitCode", "Closes the emulator and returns the provided code")]
public void CloseEmulatorWithCode(int exitCode) => APIs.EmuClient.CloseEmulatorWithCode(exitCode);
public void CloseEmulatorWithCode(int exitCode) => APIs.EmuClient.CloseEmulator(exitCode);
[LuaMethodExample("local inclibor = client.borderheight( );")]
[LuaMethod("borderheight", "Gets the current height in pixels of the letter/pillarbox area (top side only) around the emu display surface, excluding the gameExtraPadding you've set. This function (the whole lot of them) should be renamed or refactored since the padding areas have got more complex.")]