From de2da910c2ee42250fc36874bf90d1b0f755e4f8 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 29 Nov 2019 12:47:50 -0600 Subject: [PATCH] Lua - simplify some logic --- .../tools/Lua/Libraries/EmuLuaLibrary.cs | 13 ++++--------- .../tools/Lua/Libraries/NotReallyLuaLibrary.cs | 2 +- .../tools/Lua/Libraries/PlatformEmuLuaLibrary.cs | 2 +- BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs index 7b031f9214..45cc4866b3 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs @@ -209,20 +209,20 @@ namespace BizHawk.Client.EmuHawk _lua.Pop(); } - public ResumeResult ResumeScript(Lua script) + public override ResumeResult ResumeScript(LuaFile lf) { - _currThread = script; + _currThread = lf.Thread; try { LuaLibraryBase.SetCurrentThread(_currThread); - var execResult = script.Resume(0); + var execResult = _currThread.Resume(0); _lua.RunScheduledDisposes(); // not sure how this is going to work out, so do this too - script.RunScheduledDisposes(); + _currThread.RunScheduledDisposes(); _currThread = null; var result = new ResumeResult(); @@ -246,11 +246,6 @@ namespace BizHawk.Client.EmuHawk } } - public override ResumeResult ResumeScriptFromThreadOf(LuaFile lf) - { - return ResumeScript(lf.Thread); - } - public static void Print(params object[] outputs) { ConsoleLuaLibrary.Log(outputs); diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/NotReallyLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/NotReallyLuaLibrary.cs index 156a47cfe5..96f4ab85cd 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/NotReallyLuaLibrary.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/NotReallyLuaLibrary.cs @@ -40,7 +40,7 @@ namespace BizHawk.Client.EmuHawk { } private static readonly EmuLuaLibrary.ResumeResult EmptyResumeResult = new EmuLuaLibrary.ResumeResult(); - public override EmuLuaLibrary.ResumeResult ResumeScriptFromThreadOf(LuaFile lf) + public override EmuLuaLibrary.ResumeResult ResumeScript(LuaFile lf) { return EmptyResumeResult; } diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/PlatformEmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/PlatformEmuLuaLibrary.cs index d831bbd078..4e4bedc80b 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/PlatformEmuLuaLibrary.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/PlatformEmuLuaLibrary.cs @@ -29,7 +29,7 @@ namespace BizHawk.Client.EmuHawk public abstract void EndLuaDrawing(); public abstract void ExecuteString(string command); public abstract void Restart(IEmulatorServiceProvider newServiceProvider); - public abstract EmuLuaLibrary.ResumeResult ResumeScriptFromThreadOf(LuaFile lf); + public abstract EmuLuaLibrary.ResumeResult ResumeScript(LuaFile lf); public abstract void SpawnAndSetFileThread(string pathToLoad, LuaFile lf); public abstract void StartLuaDrawing(); public abstract void WindowClosed(IntPtr handle); diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index f255b68cdf..39d27c78d7 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -551,7 +551,7 @@ namespace BizHawk.Client.EmuHawk var prohibit = lf.FrameWaiting && !includeFrameWaiters; if (!prohibit) { - var result = LuaImp.ResumeScriptFromThreadOf(lf); + var result = LuaImp.ResumeScript(lf); if (result.Terminated) { LuaImp.CallExitEvent(lf);