From b45776d2ad5f8517d40209c32ab903d973ed0ff3 Mon Sep 17 00:00:00 2001
From: Jari van der Kaap <jarivdkaap@gmail.com>
Date: Tue, 3 Jan 2023 00:27:40 +0100
Subject: [PATCH] Changed UI Scripting init on frontend to different hook when
 everything is initialized

---
 src/client/component/ui_scripting.cpp | 15 +++++++++++++--
 src/client/game/symbols.hpp           |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/client/component/ui_scripting.cpp b/src/client/component/ui_scripting.cpp
index 63310f4f..558e6ef9 100644
--- a/src/client/component/ui_scripting.cpp
+++ b/src/client/component/ui_scripting.cpp
@@ -18,6 +18,7 @@ namespace ui_scripting
 		std::unordered_map<game::hks::cclosure*, std::function<arguments(const function_arguments& args)>> converted_functions;
 
 		utils::hook::detour ui_cod_init_hook;
+		utils::hook::detour ui_cod_lobbyui_init_hook;
 		utils::hook::detour ui_shutdown_hook;
 		utils::hook::detour hks_package_require_hook;
 		utils::hook::detour lua_cod_getrawfile_hook;
@@ -216,9 +217,18 @@ namespace ui_scripting
 			}
 		}
 
-		void ui_cod_init_stub(void* a1, void* a2)
+		void ui_cod_init_stub(bool frontend)
 		{
-			ui_cod_init_hook.invoke(a1, a2);
+			ui_cod_init_hook.invoke(frontend);
+
+			if (game::Com_IsRunningUILevel())
+				return;
+			const auto _0 = utils::finally(&try_start);
+		}
+
+		void ui_cod_lobbyui_init_stub()
+		{
+			ui_cod_lobbyui_init_hook.invoke();
 			const auto _0 = utils::finally(&try_start);
 		}
 
@@ -361,6 +371,7 @@ namespace ui_scripting
 
 			hks_package_require_hook.create(0x141D28EF0_g, hks_package_require_stub);
 			ui_cod_init_hook.create(0x141F298B0_g, ui_cod_init_stub);
+			ui_cod_lobbyui_init_hook.create(0x141F2C620_g, ui_cod_lobbyui_init_stub);
 			ui_shutdown_hook.create(0x14270E9C0_g, ui_shutdown_stub);
 			lua_cod_getrawfile_hook.create(0x141F0F880_g, lua_cod_getrawfile_stub);
 
diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp
index b8dbe231..44841ac9 100644
--- a/src/client/game/symbols.hpp
+++ b/src/client/game/symbols.hpp
@@ -16,7 +16,8 @@ namespace game
 	// Com
 	WEAK symbol<void(int channel, unsigned int label, const char* fmt, ...)> Com_Printf{0x1421499C0};
 	WEAK symbol<void(const char* file, int line, int code, const char* fmt, ...)> Com_Error_{0x1420F8BD0};
-	WEAK symbol<bool(eModes mode)> Com_SessionMode_IsMode{0x1420F7DD0};
+	WEAK symbol<bool(eModes mode)> Com_SessionMode_IsMode{0x1420F7DD0};
+	WEAK symbol<bool()> Com_IsRunningUILevel{0x142148DB0};
 	WEAK symbol<void(uint32_t localClientNum, eModes fromMode, eModes toMode, uint32_t flags)> Com_SwitchMode{
 		0x14214AF30
 	};