From 9a68b154120506ab85eacb6d18fe677b35c36d0d Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Wed, 25 Sep 2024 15:39:01 +0200 Subject: [PATCH] VScript: run initial registration code class callbacks first Must be ran within the hook as otherwise engine code class functions won't be registered. --- src/game/client/vscript_client.cpp | 8 ++++++++ src/game/server/vscript_server.cpp | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/src/game/client/vscript_client.cpp b/src/game/client/vscript_client.cpp index 673b2577..431228c5 100644 --- a/src/game/client/vscript_client.cpp +++ b/src/game/client/vscript_client.cpp @@ -519,6 +519,7 @@ static ConVar show_motd_on_server_first_join("show_motd_on_server_first_join", " //--------------------------------------------------------------------------------- static void Script_RegisterClientEntityClassFuncs() { + v_Script_RegisterClientEntityClassFuncs(); static bool initialized = false; if (initialized) @@ -529,6 +530,7 @@ static void Script_RegisterClientEntityClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterClientPlayerClassFuncs() { + v_Script_RegisterClientPlayerClassFuncs(); static bool initialized = false; if (initialized) @@ -539,6 +541,7 @@ static void Script_RegisterClientPlayerClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterClientAIClassFuncs() { + v_Script_RegisterClientAIClassFuncs(); static bool initialized = false; if (initialized) @@ -549,6 +552,7 @@ static void Script_RegisterClientAIClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterClientWeaponClassFuncs() { + v_Script_RegisterClientWeaponClassFuncs(); static bool initialized = false; if (initialized) @@ -559,6 +563,7 @@ static void Script_RegisterClientWeaponClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterClientProjectileClassFuncs() { + v_Script_RegisterClientProjectileClassFuncs(); static bool initialized = false; if (initialized) @@ -569,6 +574,7 @@ static void Script_RegisterClientProjectileClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterClientTitanSoulClassFuncs() { + v_Script_RegisterClientTitanSoulClassFuncs(); static bool initialized = false; if (initialized) @@ -579,6 +585,7 @@ static void Script_RegisterClientTitanSoulClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterClientPlayerDecoyClassFuncs() { + v_Script_RegisterClientPlayerDecoyClassFuncs(); static bool initialized = false; if (initialized) @@ -589,6 +596,7 @@ static void Script_RegisterClientPlayerDecoyClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterClientFirstPersonProxyClassFuncs() { + v_Script_RegisterClientFirstPersonProxyClassFuncs(); static bool initialized = false; if (initialized) diff --git a/src/game/server/vscript_server.cpp b/src/game/server/vscript_server.cpp index dc23e4bd..c5d03548 100644 --- a/src/game/server/vscript_server.cpp +++ b/src/game/server/vscript_server.cpp @@ -340,6 +340,7 @@ void Script_RegisterAdminPanelFunctions(CSquirrelVM* s) //--------------------------------------------------------------------------------- static void Script_RegisterServerEntityClassFuncs() { + v_Script_RegisterServerEntityClassFuncs(); static bool initialized = false; if (initialized) @@ -350,6 +351,7 @@ static void Script_RegisterServerEntityClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterServerPlayerClassFuncs() { + v_Script_RegisterServerPlayerClassFuncs(); static bool initialized = false; if (initialized) @@ -360,6 +362,7 @@ static void Script_RegisterServerPlayerClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterServerAIClassFuncs() { + v_Script_RegisterServerAIClassFuncs(); static bool initialized = false; if (initialized) @@ -370,6 +373,7 @@ static void Script_RegisterServerAIClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterServerWeaponClassFuncs() { + v_Script_RegisterServerWeaponClassFuncs(); static bool initialized = false; if (initialized) @@ -380,6 +384,7 @@ static void Script_RegisterServerWeaponClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterServerProjectileClassFuncs() { + v_Script_RegisterServerProjectileClassFuncs(); static bool initialized = false; if (initialized) @@ -390,6 +395,7 @@ static void Script_RegisterServerProjectileClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterServerTitanSoulClassFuncs() { + v_Script_RegisterServerTitanSoulClassFuncs(); static bool initialized = false; if (initialized) @@ -400,6 +406,7 @@ static void Script_RegisterServerTitanSoulClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterServerPlayerDecoyClassFuncs() { + v_Script_RegisterServerPlayerDecoyClassFuncs(); static bool initialized = false; if (initialized) @@ -410,6 +417,7 @@ static void Script_RegisterServerPlayerDecoyClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterServerSpawnpointClassFuncs() { + v_Script_RegisterServerSpawnpointClassFuncs(); static bool initialized = false; if (initialized) @@ -420,6 +428,7 @@ static void Script_RegisterServerSpawnpointClassFuncs() //--------------------------------------------------------------------------------- static void Script_RegisterServerFirstPersonProxyClassFuncs() { + v_Script_RegisterServerFirstPersonProxyClassFuncs(); static bool initialized = false; if (initialized)