From 085335730076beebb5adcb311cf2685f2a774f4c Mon Sep 17 00:00:00 2001 From: EvilFactory Date: Sun, 13 Nov 2022 15:56:37 -0300 Subject: [PATCH] Move think hook to a better place --- Barotrauma/BarotraumaClient/ClientSource/GameMain.cs | 3 +-- Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs | 2 -- Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs b/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs index 6016a10c4..491e77a4b 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs @@ -1,4 +1,4 @@ -using Barotrauma.IO; +using Barotrauma.IO; using Barotrauma.Media; using Barotrauma.Networking; using Barotrauma.Particles; @@ -922,7 +922,6 @@ namespace Barotrauma luaSw.Start(); GameMain.LuaCs.Update(); - GameMain.LuaCs.Hook.Call("think"); luaSw.Stop(); PerformanceCounter.AddElapsedTicks("Think Hook", luaSw.ElapsedTicks); diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs index 08e7a4a2e..c47159a08 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs @@ -760,8 +760,6 @@ namespace Barotrauma compatHookPostfixMethods.Clear(); } - public void Update() { } - private Stopwatch performanceMeasurement = new Stopwatch(); [MoonSharpHidden] diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index 8fa2365d3..a17d1a190 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -198,9 +198,9 @@ namespace Barotrauma public void Update() { - Hook?.Update(); Timer?.Update(); Steam?.Update(); + Hook?.Call("think"); } public void Stop() @@ -250,7 +250,6 @@ namespace Barotrauma PrintMessage("Lua! Version " + AssemblyInfo.GitRevision); - if (File.Exists(configFileName)) { using (var file = File.Open(configFileName, FileMode.Open, FileAccess.Read))