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

hook addition name case-insensitivity fix

Browse Source
This commit is contained in:
Oiltanker
2022-04-15 21:03:23 +03:00
parent 2f0e83badd
commit e4ea88d598
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaResult.cs
View File

@@ -101,11 +101,5 @@ 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();
}
}

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

@@ -310,6 +310,9 @@ namespace Barotrauma
public void Add(string name, string hookName, CsFunc hook, ACsMod owner = null)
{
name = name.ToLower();
LuaCsSetup.PrintLogMessage($"'{name}' | '{hookName}'");
if (name == null || hookName == null || hook == null) throw new ArgumentNullException("Names and Hook must not be null");
if (!hookFunctions.ContainsKey(name))
@@ -362,21 +365,10 @@ namespace Barotrauma
public T Call<T>(string name, params object[] args)
{
if (
typeof(T) != typeof(object) &&
!name.StartsWith("gapOxygenUpdate") &&
!name.StartsWith("signal") &&
!name.StartsWith("statusEffect")
)
{
}
#if CLIENT
if (GameMain.GameSession?.IsRunning == false && GameMain.IsSingleplayer)
//return null;
return default(T);
#endif
//if (GameMain.LuaCs == null) return null;
//if (name == null) return null;
if (GameMain.LuaCs == null) return default(T);
if (name == null) return default(T);
if (args == null) { args = new object[] { }; }
@@ -384,10 +376,8 @@ namespace Barotrauma
name = name.ToLower();
if (!hookFunctions.ContainsKey(name))
//return null;
return default(T);
//object lastResult = null;
T lastResult = default(T);
if (hookFunctions.ContainsKey(name))

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

@@ -158,6 +158,7 @@ namespace Barotrauma
}
private void PrintMessage(object message) => PrintMessageBase("[LUA] ", message, "nil");
public static void PrintCsMessage(object message) => PrintMessageBase("[CS] ", message, "Null");
public static void PrintLogMessage(object message) => PrintMessageBase("[LuaCs LOG] ", message, "Null");
public DynValue DoString(string code, Table globalContext = null, string codeStringFriendly = null)
{