From 8f10ce66a61092c3dadf61c91af4d4d6c1beaf5b Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 5 Dec 2020 05:20:14 +1000 Subject: [PATCH] Merge EventsLuaLibrary.RegisteredFunctions into Win32LuaLibraries --- src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs | 2 -- src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs b/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs index 84f609faa9..d0d5b3862a 100644 --- a/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs +++ b/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs @@ -29,8 +29,6 @@ namespace BizHawk.Client.Common public override string Name => "event"; - public LuaFunctionList RegisteredFunctions { get; } = new LuaFunctionList(); - private void LogMemoryCallbacksNotImplemented() { Log($"{Emulator.Attributes().CoreName} does not implement memory callbacks"); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs index 79c7dd8463..4f435afda6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs @@ -150,7 +150,7 @@ namespace BizHawk.Client.EmuHawk public bool FrameAdvanceRequested { get; private set; } - public override LuaFunctionList RegisteredFunctions => EventsLibrary.RegisteredFunctions; + public override LuaFunctionList RegisteredFunctions { get; } = new LuaFunctionList(); public override void CallSaveStateEvent(string name) {