diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs index 402ebfd7f7..65df2b36e5 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs @@ -102,6 +102,22 @@ namespace BizHawk.Client.EmuHawk } } + public void StartLuaDrawing() + { + if (ScriptList.Any() && GuiLibrary.SurfaceIsNull) + { + GuiLibrary.DrawNew("emu"); + } + } + + public void EndLuaDrawing() + { + if (ScriptList.Any()) + { + GuiLibrary.DrawFinish(); + } + } + public LuaDocumentation Docs { get; } public bool IsRunning { get; set; } public EventWaitHandle LuaWait { get; private set; } diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index 26edb437bc..55c0e5a061 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -549,22 +549,6 @@ namespace BizHawk.Client.EmuHawk } } - public void StartLuaDrawing() - { - if (LuaImp.ScriptList.Any() && LuaImp.GuiLibrary.SurfaceIsNull) - { - LuaImp.GuiLibrary.DrawNew("emu"); - } - } - - public void EndLuaDrawing() - { - if (LuaImp.ScriptList.Any()) - { - LuaImp.GuiLibrary.DrawFinish(); - } - } - public bool WaitOne(int timeout) { if (!IsHandleCreated || IsDisposed) @@ -845,8 +829,8 @@ namespace BizHawk.Client.EmuHawk // We want any gui.text messages from a script to immediately update even when paused GlobalWin.OSD.ClearGUIText(); GlobalWin.Tools.UpdateToolsAfter(); - EndLuaDrawing(); - StartLuaDrawing(); + LuaImp.EndLuaDrawing(); + LuaImp.StartLuaDrawing(); } catch (IOException) { diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs index 12085bc660..243a412927 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -650,7 +650,7 @@ namespace BizHawk.Client.EmuHawk { if (!fromLua) { - LuaConsole.StartLuaDrawing(); + LuaConsole.LuaImp.StartLuaDrawing(); } } @@ -670,7 +670,7 @@ namespace BizHawk.Client.EmuHawk { if (!fromLua) { - LuaConsole.EndLuaDrawing(); + LuaConsole.LuaImp.EndLuaDrawing(); } } } @@ -707,7 +707,7 @@ namespace BizHawk.Client.EmuHawk if (Global.Config.RunLuaDuringTurbo && Has()) { - LuaConsole.EndLuaDrawing(); + LuaConsole.LuaImp.EndLuaDrawing(); } }