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

Potential fix for threading issues and added CSActive var

Browse Source
This commit is contained in:
Evil Factory
2022-06-09 16:02:18 -03:00
parent 23ad3ea00b
commit ed1fbdbe5e
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
View File

@@ -284,16 +284,18 @@ namespace Barotrauma
public object CallLuaFunction(object function, params object[] arguments) public object CallLuaFunction(object function, params object[] arguments)
{ {
try lock (lua)
{ {
return lua.Call(function, arguments); try
{
return lua.Call(function, arguments);
}
catch (Exception e)
{
HandleException(e);
}
return null;
} }
catch (Exception e)
{
HandleException(e);
}
return null;
} }
private void SetModulePaths(string[] str) private void SetModulePaths(string[] str)
@@ -359,6 +361,7 @@ namespace Barotrauma
} }
else Config = new LuaCsSetupConfig(); else Config = new LuaCsSetupConfig();
bool csActive = GetPackage("CsForBarotrauma", false, true) != null;
LuaScriptLoader = new LuaScriptLoader(); LuaScriptLoader = new LuaScriptLoader();
LuaScriptLoader.ModulePaths = new string[] { }; LuaScriptLoader.ModulePaths = new string[] { };
@@ -417,12 +420,12 @@ namespace Barotrauma
lua.Globals["Steam"] = Steam; lua.Globals["Steam"] = Steam;
lua.Globals["ExecutionNumber"] = executionNumber; lua.Globals["ExecutionNumber"] = executionNumber;
lua.Globals["CSActive"] = csActive;
lua.Globals["SERVER"] = IsServer; lua.Globals["SERVER"] = IsServer;
lua.Globals["CLIENT"] = IsClient; lua.Globals["CLIENT"] = IsClient;
if (csActive)
if (GetPackage("CsForBarotrauma", false, true) != null)
{ {
PrintMessage("Cs! Version " + AssemblyInfo.GitRevision); PrintMessage("Cs! Version " + AssemblyInfo.GitRevision);