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

hook fixes, keybinds are not working

Browse Source
This commit is contained in:
Oiltanker
2022-04-15 20:17:35 +03:00
parent 3eba20ecb7
commit 2f0e83badd
3 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaResult.cs
+5 -5
View File
@@ -102,10 +102,10 @@ namespace Barotrauma
return null;
}
public static implicit operator bool(LuaResult res) => res.Bool();
public static implicit operator float(LuaResult res) => res.Float();
public static implicit operator string(LuaResult res) => res.String();
public static implicit operator double(LuaResult res) => res.Double();
public static implicit operator DynValue(LuaResult res) => res.DynValue();
//public static implicit operator bool(LuaResult res) => res.Bool();
//public static implicit operator float(LuaResult res) => res.Float();
//public static implicit operator string(LuaResult res) => res.String();
//public static implicit operator double(LuaResult res) => res.Double();
//public static implicit operator DynValue(LuaResult res) => res.DynValue();
}
}
Barotrauma/BarotraumaShared/SharedSource/Lua/LuaCustomConverters.cs
+2 -3
View File
@@ -23,10 +23,9 @@ namespace Barotrauma
var function = v.Function;
return (Func<Fixture, Vector2, Vector2, float, float>)((Fixture a, Vector2 b, Vector2 c, float d) => new LuaResult(function.Call(a, b, c, d)).Float());
});
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(Closure), v => v.Function);
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(CsAction), v => (CsAction)( args => GameMain.LuaCs.CallLuaFunction(v.Function, args) ));
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(CsFunc), v => (CsFunc)( args => new LuaResult(GameMain.LuaCs.CallLuaFunction(v.Function, args)).Object() ));
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(CsPatch), v => (CsPatch)( (self, args) => new LuaResult(GameMain.LuaCs.CallLuaFunction(v.Function, self, args)).Object() ));
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(CsFunc), v => (CsFunc)( args => new LuaResult(GameMain.LuaCs.CallLuaFunction(v.Function, args)) ));
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(CsPatch), v => (CsPatch)( (self, args) => new LuaResult(GameMain.LuaCs.CallLuaFunction(v.Function, self, args)) ));
#if CLIENT
RegisterAction<float>();