From f57897515e6557ae2716644e9ce245d00c1c9d53 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 4 Dec 2020 23:42:31 +1000 Subject: [PATCH] Add prop EngineName to abstract class LuaLibraries --- .../lua/CommonLibs/EmulationLuaLibrary.cs | 5 +---- src/BizHawk.Client.Common/lua/LuaLibraries.cs | 3 +++ src/BizHawk.Client.EmuHawk/tools/Lua/UnixLuaLibraries.cs | 2 ++ src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/BizHawk.Client.Common/lua/CommonLibs/EmulationLuaLibrary.cs b/src/BizHawk.Client.Common/lua/CommonLibs/EmulationLuaLibrary.cs index 8069317f89..594bc02af2 100644 --- a/src/BizHawk.Client.Common/lua/CommonLibs/EmulationLuaLibrary.cs +++ b/src/BizHawk.Client.Common/lua/CommonLibs/EmulationLuaLibrary.cs @@ -102,9 +102,6 @@ namespace BizHawk.Client.Common public string GetBoardName() => APIs.Emulation.GetBoardName(); [LuaMethod("getluacore", "returns the name of the Lua core currently in use")] - public string GetLuaBackend() - { - return Lua.WhichLua; - } + public string GetLuaBackend() => _luaLibsImpl.EngineName; } } diff --git a/src/BizHawk.Client.Common/lua/LuaLibraries.cs b/src/BizHawk.Client.Common/lua/LuaLibraries.cs index ee29505b11..f3482e60d8 100644 --- a/src/BizHawk.Client.Common/lua/LuaLibraries.cs +++ b/src/BizHawk.Client.Common/lua/LuaLibraries.cs @@ -10,6 +10,9 @@ namespace BizHawk.Client.Common public abstract class LuaLibraries { public readonly LuaDocumentation Docs = new LuaDocumentation(); + + public abstract string EngineName { get; } + public abstract LuaFunctionList RegisteredFunctions { get; } public abstract GuiLuaLibrary GuiLibrary { get; } protected readonly Dictionary Libraries = new Dictionary(); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/UnixLuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/UnixLuaLibraries.cs index 4f78e295bb..98c9c1506f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/UnixLuaLibraries.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/UnixLuaLibraries.cs @@ -10,6 +10,8 @@ namespace BizHawk.Client.EmuHawk /// public sealed class UnixLuaLibraries : LuaLibraries { + public override string EngineName => null; + public override void CallExitEvent(LuaFile lf) { } diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs index 5671fa1469..2f7926f3d9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs @@ -116,6 +116,8 @@ namespace BizHawk.Client.EmuHawk private EmulationLuaLibrary EmulationLuaLibrary => (EmulationLuaLibrary)Libraries[typeof(EmulationLuaLibrary)]; + public override string EngineName => Lua.WhichLua; + public override GuiLuaLibrary GuiLibrary => (GuiLuaLibrary) Libraries[typeof(GuiLuaLibrary)]; private static void LogToLuaConsole(object outputs) => _logToLuaConsoleCallback(new[] { outputs });