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

Move LuaLibraries.GuiLibrary to inheritors, fix related NREs on Unix

This commit is contained in:
YoshiRulz 2020-04-14 05:10:07 +10:00
parent 1fd620a1f4
commit 7cce81a880
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -92,7 +92,7 @@ namespace BizHawk.Client.EmuHawk
MainForm.FrameBufferResized();
}
LuaImp.GuiLibrary.DrawFinish();
LuaImp.GuiLibrary?.DrawFinish();
LuaImp?.Close();
GlobalWin.OSD.ClearGuiText();
}
@ -545,7 +545,7 @@ namespace BizHawk.Client.EmuHawk
return;
}
if (LuaImp.GuiLibrary.SurfaceIsNull)
if (LuaImp.GuiLibrary?.SurfaceIsNull == true)
{
LuaImp.GuiLibrary.DrawNew("emu");
}

2
BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs
View File

@ -12,7 +12,7 @@ namespace BizHawk.Client.EmuHawk
{
public readonly LuaDocumentation Docs = new LuaDocumentation();
public abstract LuaFunctionList RegisteredFunctions { get; }
public GuiLuaLibrary GuiLibrary => (GuiLuaLibrary) Libraries[typeof(GuiLuaLibrary)];
public abstract GuiLuaLibrary GuiLibrary { get; }
protected readonly Dictionary<Type, LuaLibraryBase> Libraries = new Dictionary<Type, LuaLibraryBase>();
public IEnumerable<LuaFile> RunningScripts => ScriptList.Where(lf => lf.Enabled);
public readonly LuaFileList ScriptList = new LuaFileList();

1
BizHawk.Client.EmuHawk/tools/Lua/UnixLuaLibraries.cs
View File

@ -36,6 +36,7 @@ namespace BizHawk.Client.EmuHawk
}
private static readonly LuaFunctionList EmptyLuaFunList = new LuaFunctionList();
public override LuaFunctionList RegisteredFunctions => EmptyLuaFunList;
public override GuiLuaLibrary GuiLibrary => null;
public override void Restart(IEmulatorServiceProvider newServiceProvider)
{
}

2
BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
View File

@ -110,6 +110,8 @@ namespace BizHawk.Client.EmuHawk
private EmulationLuaLibrary EmulationLuaLibrary => (EmulationLuaLibrary)Libraries[typeof(EmulationLuaLibrary)];
public override GuiLuaLibrary GuiLibrary => (GuiLuaLibrary) Libraries[typeof(GuiLuaLibrary)];
public override void Restart(IEmulatorServiceProvider newServiceProvider)
{
foreach (var lib in Libraries)