diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaCustomConverters.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaConverters.cs similarity index 95% rename from Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaCustomConverters.cs rename to Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaConverters.cs index da62d5785..74190eb7b 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaCustomConverters.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaConverters.cs @@ -6,16 +6,10 @@ using LuaCsCompatPatchFunc = Barotrauma.LuaCsPatch; namespace Barotrauma { - public delegate DynValue CallLuaFunctionFunc(object function, params object[] args); - - internal static class LuaCustomConverters + partial class LuaCsSetup { - private static CallLuaFunctionFunc CallLuaFunction; - - public static void Initialize(CallLuaFunctionFunc callLuaFunction) + private void RegisterLuaConverters() { - CallLuaFunction = callLuaFunction; - RegisterAction(); RegisterAction(); RegisterAction(); @@ -194,7 +188,7 @@ namespace Barotrauma : throw new ScriptRuntimeException("use Double(value) to pass primitive type 'double' to C#")); } - public static void RegisterAction() + private void RegisterAction() { Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(Action), v => { @@ -209,7 +203,7 @@ namespace Barotrauma }); } - public static void RegisterAction() + private void RegisterAction() { Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(Action), v => { @@ -224,7 +218,7 @@ namespace Barotrauma }); } - public static void RegisterAction() + private void RegisterAction() { Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(Action), v => { @@ -239,7 +233,7 @@ namespace Barotrauma }); } - public static void RegisterFunc() + private void RegisterFunc() { Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(Func), v => { @@ -254,7 +248,7 @@ namespace Barotrauma }); } - public static void RegisterFunc() + private void RegisterFunc() { Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(Func), v => { @@ -269,7 +263,7 @@ namespace Barotrauma }); } - public static void RegisterFunc() + private void RegisterFunc() { Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(Func), v => { diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index 3e2b5742e..d473f6a9d 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -409,7 +409,7 @@ namespace Barotrauma LuaScriptLoader = new LuaScriptLoader(); LuaScriptLoader.ModulePaths = new string[] { }; - LuaCustomConverters.Initialize(CallLuaFunction); + RegisterLuaConverters(); lua = new Script(CoreModules.Preset_SoftSandbox | CoreModules.Debug); lua.Options.DebugPrint = PrintMessage;