diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs index ba0d100e9d..dfd258df0e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs @@ -42,7 +42,7 @@ namespace BizHawk.Client.EmuHawk public abstract void EndLuaDrawing(); public abstract void ExecuteString(string command); public abstract void Restart(IEmulatorServiceProvider newServiceProvider); - public abstract Win32LuaLibraries.ResumeResult ResumeScript(LuaFile lf); + public abstract (bool WaitForFrame, bool Terminated) ResumeScript(LuaFile lf); public abstract void SpawnAndSetFileThread(string pathToLoad, LuaFile lf); public abstract void StartLuaDrawing(); public abstract void WindowClosed(IntPtr handle); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/UnixLuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/UnixLuaLibraries.cs index d9b3542422..b650d50256 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/UnixLuaLibraries.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/UnixLuaLibraries.cs @@ -40,11 +40,9 @@ namespace BizHawk.Client.EmuHawk public override void Restart(IEmulatorServiceProvider newServiceProvider) { } - private static readonly Win32LuaLibraries.ResumeResult EmptyResumeResult = new Win32LuaLibraries.ResumeResult(); - public override Win32LuaLibraries.ResumeResult ResumeScript(LuaFile lf) - { - return EmptyResumeResult; - } + + public override (bool WaitForFrame, bool Terminated) ResumeScript(LuaFile lf) => (false, false); + public override void SpawnAndSetFileThread(string pathToLoad, LuaFile lf) { } diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs index e8ac993d65..b69ce2ad55 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs @@ -198,7 +198,7 @@ namespace BizHawk.Client.EmuHawk public override void RunScheduledDisposes() => _lua.RunScheduledDisposes(); - public override ResumeResult ResumeScript(LuaFile lf) + public override (bool WaitForFrame, bool Terminated) ResumeScript(LuaFile lf) { _currThread = lf.Thread; @@ -214,17 +214,9 @@ namespace BizHawk.Client.EmuHawk _currThread.RunScheduledDisposes(); _currThread = null; - var result = new ResumeResult(); - if (execResult == 0) - { - // terminated - result.Terminated = true; - } - else - { - // yielded - result.WaitForFrame = FrameAdvanceRequested; - } + var result = execResult == 0 + ? (WaitForFrame: false, Terminated: true) // terminated + : (WaitForFrame: FrameAdvanceRequested, Terminated: false); // yielded FrameAdvanceRequested = false; return result; @@ -250,11 +242,5 @@ namespace BizHawk.Client.EmuHawk { _currThread.Yield(0); } - - public class ResumeResult - { - public bool WaitForFrame { get; set; } - public bool Terminated { get; set; } - } } }