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

Introduce the LuaCsLogger class and make everything use that instead

Browse Source
This commit is contained in:
EvilFactory
2022-12-28 16:01:48 -03:00
parent 5807900556
commit 8fdf2156dc
16 changed files with 168 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs
+5 -6
View File
@@ -814,8 +814,8 @@ namespace Barotrauma
{
argsSb.Append(arg + " ");
}
luaCs.PrintError($"Error in Hook '{name}'->'{key}', with args '{argsSb}':\n{e}", LuaCsMessageOrigin.Unknown);
luaCs.HandleException(e, LuaCsMessageOrigin.Unknown);
LuaCsLogger.LogError($"Error in Hook '{name}'->'{key}', with args '{argsSb}':\n{e}", LuaCsMessageOrigin.Unknown);
LuaCsLogger.HandleException(e, LuaCsMessageOrigin.Unknown);
}
}
@@ -1177,10 +1177,9 @@ namespace Barotrauma
il.If((il) =>
{
// IL: LuaCs.HandleException(exception, LuaCsMessageOrigin.LuaMod);
il.LoadField(luaCsField);
il.LoadLocal(exception);
il.LoadConstant((int)LuaCsMessageOrigin.LuaMod); // underlying enum type is int
il.Call(typeof(LuaCsSetup).GetMethod(nameof(LuaCsSetup.HandleException), BindingFlags.NonPublic | BindingFlags.Instance));
il.Call(typeof(LuaCsLogger).GetMethod(nameof(LuaCsLogger.HandleException), BindingFlags.Public | BindingFlags.Static));
});
il.EndCatchBlock(catchBlock);
@@ -1227,7 +1226,7 @@ namespace Barotrauma
{
if (methodPatches.Prefixes.Remove(identifier))
{
luaCs.PrintMessage($"Replacing existing prefix: {identifier}");
LuaCsLogger.LogMessage($"Replacing existing prefix: {identifier}");
}
methodPatches.Prefixes.Add(identifier, new LuaCsPatch
@@ -1240,7 +1239,7 @@ namespace Barotrauma
{
if (methodPatches.Postfixes.Remove(identifier))
{
luaCs.PrintMessage($"Replacing existing postfix: {identifier}");
LuaCsLogger.LogMessage($"Replacing existing postfix: {identifier}");
}
methodPatches.Postfixes.Add(identifier, new LuaCsPatch