From e4ea88d5988c9af2628a41d6397c2d2b724e5670 Mon Sep 17 00:00:00 2001 From: Oiltanker Date: Fri, 15 Apr 2022 21:03:23 +0300 Subject: [PATCH] hook addition name case-insensitivity fix --- .../SharedSource/Lua/LuaClasses/LuaResult.cs | 6 ------ .../SharedSource/LuaCs/LuaCsHook.cs | 16 +++------------- .../SharedSource/LuaCs/LuaCsSetup.cs | 1 + 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaResult.cs b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaResult.cs index db158de6d..c71cb9e50 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaResult.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaResult.cs @@ -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(); } } \ No newline at end of file diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs index c0abbd96d..f1efbb405 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs @@ -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(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)) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index f81505cea..dba7e7cc7 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -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) {