vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Hook.Add compatibility with C# mods

Browse Source
This commit is contained in:
peelz
2022-08-20 10:56:50 -04:00
parent 9fb25252a6
commit d547c97c80
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs
View File

@@ -409,8 +409,13 @@ namespace Barotrauma
() =>
{
if (getValidArgs == null) return null;
return getValidArgs().ToObject<string[][]>();
}, isCheat);
var validArgs = getValidArgs();
if (validArgs is DynValue luaValue)
{
return luaValue.ToObject<string[][]>();
}
return (string[][])validArgs;
}, isCheat);
luaAddedCommand.Add(cmd);
DebugConsole.Commands.Add(cmd);

10
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs
View File

@@ -18,7 +18,7 @@ using Sigil.NonGeneric;
namespace Barotrauma
{
public delegate void LuaCsAction(params object[] args);
public delegate DynValue LuaCsFunc(params object[] args);
public delegate object LuaCsFunc(params object[] args);
public delegate DynValue LuaCsPatchFunc(object instance, LuaCsHook.ParameterTable ptable);
internal static class SigilExtensions
@@ -777,9 +777,13 @@ namespace Barotrauma
var result = tuple.Item1.func(args);
// TODO(BREAKING): change this to !result.IsVoid()
if (result != null && !result.IsNil())
if (result is DynValue luaResult && !luaResult.IsNil())
{
lastResult = result.ToObject<T>();
lastResult = luaResult.ToObject<T>();
}
else
{
lastResult = (T)result;
}
if (luaCs.PerformanceCounter.EnablePerformanceCounter)