also merge in some of my earlier work, general improvements

Author: Vauff

src/commands.cpp

@@ -53,6 +53,10 @@ extern CGameEntitySystem* g_pEntitySystem;
 extern IVEngineServer2* g_pEngineServer2;
 extern ISteamHTTP* g_http;
 extern CConVar<CUtlString> g_cvarFlashLightAttachment;
+extern INetworkGameServer* GetNetworkGameServer();
+extern int g_iSpawnGroupLoads;
+extern CSpawnGroupMgrGameSystem* g_pSpawnGroupMgr;
+extern CUtlVector<CServerSideClient*>* GetClientList();
 
 CConVar<bool> g_cvarEnableCommands("cs2f_commands_enable", FCVAR_NONE, "Whether to enable chat commands", false);
 CConVar<bool> g_cvarEnableAdminCommands("cs2f_admin_commands_enable", FCVAR_NONE, "Whether to enable admin chat commands", false);
@@ -742,6 +746,48 @@ CON_COMMAND_CHAT(showteam, "<name> - Get a player's current team")
 	}
 }
 
+
+CON_COMMAND_CHAT_FLAGS(spawngroups, "Debug spawngroup info", ADMFLAG_ROOT)
+{
+	if (!GetNetworkGameServer())
+		return;
+
+	for (int i = 0; i < GetGlobals()->maxClients; i++)
+	{
+		ZEPlayer* pPlayer = g_playerManager->GetPlayer(i);
+
+		if (!pPlayer)
+			continue;
+
+		ClientPrint(player, HUD_PRINTCONSOLE, CHAT_PREFIX "Slot %i counts CCheckTransmitInfo->m_vecSpawnGroups: %i CServerSideClient->m_vecLoadedSpawnGroups: %i", i, pPlayer->GetCheckTransmitSpawnGroupCount(), pPlayer->GetClientSpawnGroupCount());
+	}
+
+	ClientPrint(player, HUD_PRINTCONSOLE, CHAT_PREFIX "PostSpawnGroupLoad count for %s: %i", GetNetworkGameServer()->GetMapName(), g_iSpawnGroupLoads);
+}
+
+CON_COMMAND_CHAT_FLAGS(clean_client_spawngroups, "Clean client spawngroups", ADMFLAG_ROOT)
+{
+	if (!g_pSpawnGroupMgr)
+		return;
+
+	CUtlVector<SpawnGroupHandle_t> vecActualSpawnGroups;
+	addresses::GetSpawnGroups(g_pSpawnGroupMgr, &vecActualSpawnGroups);
+
+	auto pClients = GetClientList();
+
+	FOR_EACH_VEC(*pClients, i)
+	{
+		auto pClient = (*pClients)[i];
+
+		if (!pClient || pClient->m_vecLoadedSpawnGroups.Count() == vecActualSpawnGroups.Count())
+			continue;
+
+		pClient->m_vecLoadedSpawnGroups = vecActualSpawnGroups;
+	}
+
+	ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Cleaned client spawngroups.");
+}
+
 #if _DEBUG
 CON_COMMAND_CHAT(myuid, "- Test")
 {

src/cs2fixes.cpp

@@ -40,7 +40,6 @@
 #include "gameconfig.h"
 #include "gameevents.pb.h"
 #include "gamesystem.h"
-#include "gamesystems/spawngroup_manager.h"
 #include "httpmanager.h"
 #include "icvar.h"
 #include "idlemanager.h"
@@ -69,6 +68,7 @@ double g_flUniversalTime;
 float g_flLastTickedTime;
 bool g_bHasTicked;
 int g_iRoundNum = 0;
+int g_iSpawnGroupLoads = 0;
 
 void Message(const char* msg, ...)
 {
@@ -124,7 +124,7 @@ SH_DECL_HOOK2(IGameEventManager2, LoadEventsFromFile, SH_NOATTRIB, 0, int, const
 SH_DECL_MANUALHOOK1_void(GoToIntermission, 0, 0, 0, bool);
 SH_DECL_MANUALHOOK2_void(PhysicsTouchShuffle, 0, 0, 0, CUtlVector<TouchLinked_t>*, bool);
 SH_DECL_MANUALHOOK3_void(DropWeapon, 0, 0, 0, CBasePlayerWeapon*, Vector*, Vector*);
-SH_DECL_HOOK1_void(CSpawnGroupMgrGameSystem, SetActiveSpawnGroup, SH_NOATTRIB, 0, SpawnGroupHandle_t);
+SH_DECL_HOOK1_void(IServer, SetGameSpawnGroupMgr, SH_NOATTRIB, 0, IGameSpawnGroupMgr*);
 
 CS2Fixes g_CS2Fixes;
 
@@ -138,7 +138,7 @@ CGameConfig* g_GameConfig = nullptr;
 ISteamHTTP* g_http = nullptr;
 CSteamGameServerAPIContext g_steamAPI;
 CCSGameRules* g_pGameRules = nullptr; // Will be null between map end & new map startup, null check if necessary!
-CSpawnGroupMgrGameSystem* g_pSpawnGroupMgr = nullptr;
+CSpawnGroupMgrGameSystem* g_pSpawnGroupMgr = nullptr; // Will be null between map end & new map startup, null check if necessary!
 int g_iCGamePlayerEquipUseId = -1;
 int g_iCGamePlayerEquipPrecacheId = -1;
 int g_iCreateWorkshopMapGroupId = -1;
@@ -148,7 +148,7 @@ int g_iLoadEventsFromFileId = -1;
 int g_iGoToIntermissionId = -1;
 int g_iPhysicsTouchShuffle = -1;
 int g_iWeaponServiceDropWeaponId = -1;
-int g_iReleaseSpawnGroupId = -1;
+int g_iSetGameSpawnGroupMgrId = -1;
 
 CGameEntitySystem* GameEntitySystem()
 {
@@ -339,9 +339,6 @@ bool CS2Fixes::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 	SH_MANUALHOOK_RECONFIGURE(GoToIntermission, offset, 0, 0);
 	g_iGoToIntermissionId = SH_ADD_MANUALDVPHOOK(GoToIntermission, pCCSGameRulesVTable, SH_MEMBER(this, &CS2Fixes::Hook_GoToIntermission), false);
 
-	auto pCSpawnGroupMgrGameSystem = (CSpawnGroupMgrGameSystem*)modules::server->FindVirtualTable("CSpawnGroupMgrGameSystem");
-	g_iReleaseSpawnGroupId = SH_ADD_DVPHOOK(CSpawnGroupMgrGameSystem, SetActiveSpawnGroup, pCSpawnGroupMgrGameSystem, SH_MEMBER(this, &CS2Fixes::Hook_SetActiveSpawnGroup), true);
-
 	Message("All hooks started!\n");
 
 	UnlockConVars();
@@ -442,7 +439,9 @@ bool CS2Fixes::Unload(char* error, size_t maxlen)
 	SH_REMOVE_HOOK_ID(g_iWeaponServiceDropWeaponId);
 	SH_REMOVE_HOOK_ID(g_iGoToIntermissionId);
 	SH_REMOVE_HOOK_ID(g_iCGamePlayerEquipUseId);
-	SH_REMOVE_HOOK_ID(g_iReleaseSpawnGroupId);
+
+	if (g_iSetGameSpawnGroupMgrId != -1)
+		SH_REMOVE_HOOK_ID(g_iSetGameSpawnGroupMgrId);
 
 	if (g_iCGamePlayerEquipPrecacheId != -1)
 		SH_REMOVE_HOOK_ID(g_iCGamePlayerEquipPrecacheId);
@@ -609,6 +608,9 @@ void CS2Fixes::Hook_StartupServer(const GameSessionConfiguration_t& config, ISou
 	g_pEntitySystem = GameEntitySystem();
 	g_pEntitySystem->AddListenerEntity(g_pEntityListener);
 
+	if (g_pNetworkServerService->GetIGameServer())
+		g_iSetGameSpawnGroupMgrId = SH_ADD_HOOK(IServer, SetGameSpawnGroupMgr, g_pNetworkServerService->GetIGameServer(), SH_MEMBER(this, &CS2Fixes::Hook_SetGameSpawnGroupMgr), false);
+
 	Message("Hook_StartupServer: %s\n", pszMapName);
 
 	RegisterEventListeners();
@@ -990,6 +992,7 @@ void CS2Fixes::Hook_CheckTransmit(CCheckTransmitInfo** ppInfoList, int infoCount
 	for (int i = 0; i < infoCount; i++)
 	{
 		auto& pInfo = ppInfoList[i];
+		CUtlVector<SpawnGroupHandle_t> m_vecSpawnGroups = *((uint8*)pInfo + 40);
 
 		// the offset happens to have a player index here,
 		// though this is probably part of the client class that contains the CCheckTransmitInfo
@@ -1006,10 +1009,13 @@ void CS2Fixes::Hook_CheckTransmit(CCheckTransmitInfo** ppInfoList, int infoCount
 		if (!pSelfZEPlayer)
 			continue;
 
+		if (m_vecSpawnGroups.Count() != pSelfZEPlayer->GetCheckTransmitSpawnGroupCount())
+			pSelfZEPlayer->SetCheckTransmitSpawnGroupCount(m_vecSpawnGroups.Count());
+
 		auto pClient = GetClientBySlot(iPlayerSlot);
 
-		if (pClient && pSelfZEPlayer->IsAdminFlagSet(ADMFLAG_ROOT))
-			ClientPrint(pSelfController, HUD_PRINTCENTER, "Client loaded SpawnGroups: %d", pClient->m_vecLoadedSpawnGroups.Count());
+		if (pClient && pClient->m_vecLoadedSpawnGroups.Count() != pSelfZEPlayer->GetClientSpawnGroupCount())
+			pSelfZEPlayer->SetClientSpawnGroupCount(pClient->m_vecLoadedSpawnGroups.Count());
 
 		for (int j = 0; j < GetGlobals()->maxClients; j++)
 		{
@@ -1223,29 +1229,10 @@ int CS2Fixes::Hook_LoadEventsFromFile(const char* filename, bool bSearchAll)
 	RETURN_META_VALUE(MRES_IGNORED, 0);
 }
 
-void CS2Fixes::Hook_SetActiveSpawnGroup(SpawnGroupHandle_t h)
+void CS2Fixes::Hook_SetGameSpawnGroupMgr(IGameSpawnGroupMgr* pSpawnGroupMgr)
 {
-	g_pSpawnGroupMgr = META_IFACEPTR(CSpawnGroupMgrGameSystem);
-
-	RETURN_META(MRES_IGNORED);
-}
-
-CON_COMMAND_F(c_clean_client_spawngroups, "", FCVAR_SPONLY)
-{
-	CUtlVector<SpawnGroupHandle_t> vecActualSpawnGroups;
-	addresses::GetSpawnGroups(g_pSpawnGroupMgr, &vecActualSpawnGroups);
-
-	auto pClients = GetClientList();
-
-	FOR_EACH_VEC(*pClients, i)
-	{
-		auto pClient = (*pClients)[i];
-
-		if (!pClient || pClient->m_vecLoadedSpawnGroups.Count() == vecActualSpawnGroups.Count())
-			continue;
-
-		pClient->m_vecLoadedSpawnGroups = vecActualSpawnGroups;
-	}
+	// This also resets our stored pointer on deletion, since null gets passed into this function, nice!
+	g_pSpawnGroupMgr = (CSpawnGroupMgrGameSystem*)pSpawnGroupMgr;
 }
 
 void CS2Fixes::OnLevelInit(char const* pMapName,
@@ -1284,6 +1271,8 @@ void CS2Fixes::OnLevelShutdown()
 {
 	Message("OnLevelShutdown()\n");
 
+	g_iSpawnGroupLoads = 0;
+
 	if (g_cvarVoteManagerEnable.Get())
 		g_pMapVoteSystem->OnLevelShutdown();
 }

src/cs2fixes.h

@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include "gamesystems/spawngroup_manager.h"
 #include "igameevents.h"
 #include "networksystem/inetworkserializer.h"
 #include <ISmmPlugin.h>
@@ -83,7 +84,7 @@ class CS2Fixes : public ISmmPlugin, public IMetamodListener
 	void Hook_CheckMovingGround(double frametime);
 	void Hook_DropWeaponPost(CBasePlayerWeapon* pWeapon, Vector* pVecTarget, Vector* pVelocity);
 	int Hook_LoadEventsFromFile(const char* filename, bool bSearchAll);
-	void Hook_SetActiveSpawnGroup(SpawnGroupHandle_t h);
+	void Hook_SetGameSpawnGroupMgr(IGameSpawnGroupMgr* pSpawnGroupMgr);
 
 public:
 	const char* GetAuthor();

src/events.cpp

@@ -27,6 +27,7 @@
 #include "entwatch.h"
 #include "eventlistener.h"
 #include "idlemanager.h"
+#include "iserver.h"
 #include "leader.h"
 #include "map_votes.h"
 #include "networkstringtabledefs.h"
@@ -43,6 +44,8 @@ extern CGameEntitySystem* g_pEntitySystem;
 extern CGlobalVars* GetGlobals();
 extern CCSGameRules* g_pGameRules;
 extern IVEngineServer2* g_pEngineServer2;
+extern INetworkGameServer* GetNetworkGameServer();
+extern int g_iSpawnGroupLoads;
 
 extern int g_iRoundNum;
 
@@ -277,6 +280,28 @@ GAME_EVENT_F(round_start)
 
 GAME_EVENT_F(round_end)
 {
+	if (GetNetworkGameServer())
+	{
+		int iHighestCheckTransmitSpawnGroupCount = 0;
+		int iHighestClientSpawnGroupCount = 0;
+
+		for (int i = 0; i < GetGlobals()->maxClients; i++)
+		{
+			ZEPlayer* pPlayer = g_playerManager->GetPlayer(i);
+
+			if (!pPlayer)
+				continue;
+
+			if (pPlayer->GetCheckTransmitSpawnGroupCount() > iHighestCheckTransmitSpawnGroupCount)
+				iHighestCheckTransmitSpawnGroupCount = pPlayer->GetCheckTransmitSpawnGroupCount();
+
+			if (pPlayer->GetClientSpawnGroupCount() > iHighestClientSpawnGroupCount)
+				iHighestClientSpawnGroupCount = pPlayer->GetClientSpawnGroupCount();
+		}
+
+		Message("PostSpawnGroupLoad count for %s at round_end: %i Highest counts CCheckTransmitInfo->m_vecSpawnGroups: %i CServerSideClient->m_vecLoadedSpawnGroups: %i\n", GetNetworkGameServer()->GetMapName(), g_iSpawnGroupLoads, iHighestCheckTransmitSpawnGroupCount, iHighestClientSpawnGroupCount);
+	}
+
 	if (!g_cvarEnableTopDefender.Get() || !GetGlobals())
 		return;
 

src/gamesystem.cpp

@@ -35,6 +35,7 @@
 extern CGlobalVars* GetGlobals();
 extern CGameConfig* g_GameConfig;
 extern CCSGameRules* g_pGameRules;
+extern int g_iSpawnGroupLoads;
 
 CBaseGameSystemFactory** CBaseGameSystemFactory::sm_pFirst = nullptr;
 
@@ -186,3 +187,8 @@ GS_EVENT_MEMBER(CGameSystem, GameShutdown)
 {
 	g_pGameRules = nullptr;
 }
+
+GS_EVENT_MEMBER(CGameSystem, PostSpawnGroupLoad)
+{
+	g_iSpawnGroupLoads++;
+}

src/gamesystem.h

@@ -68,6 +68,7 @@ class CGameSystem : public CBaseGameSystem
 	GS_EVENT(ServerPreEntityThink);
 	GS_EVENT(ServerPostEntityThink);
 	GS_EVENT(GameShutdown);
+	GS_EVENT(PostSpawnGroupLoad);
 
 	void Shutdown() override
 	{

src/playermanager.h

@@ -193,6 +193,8 @@ class ZEPlayer
 		m_flEntwatchHudX = -7.5f;
 		m_flEntwatchHudY = -2.0f;
 		m_flEntwatchHudSize = 60.0f;
+		m_iCheckTransmitSpawnGroupCount = 0;
+		m_iClientSpawnGroupCount = 0;
 	}
 
 	~ZEPlayer()
@@ -262,6 +264,8 @@ class ZEPlayer
 	void SetEntwatchHudColor(Color colorHud);
 	void SetEntwatchHudPos(float x, float y);
 	void SetEntwatchHudSize(float flSize);
+	void SetCheckTransmitSpawnGroupCount(int iCheckTransmitSpawnGroupCount) { m_iCheckTransmitSpawnGroupCount = iCheckTransmitSpawnGroupCount; }
+	void SetClientSpawnGroupCount(int iClientSpawnGroupCount) { m_iClientSpawnGroupCount = iClientSpawnGroupCount; }
 
 	uint64 GetAdminFlags() { return m_iAdminFlags; }
 	int GetAdminImmunity() { return m_iAdminImmunity; }
@@ -311,6 +315,8 @@ class ZEPlayer
 	float GetEntwatchHudX() { return m_flEntwatchHudX; }
 	float GetEntwatchHudY() { return m_flEntwatchHudY; }
 	float GetEntwatchHudSize() { return m_flEntwatchHudSize; }
+	int GetCheckTransmitSpawnGroupCount() { return m_iCheckTransmitSpawnGroupCount; }
+	int GetClientSpawnGroupCount() { return m_iClientSpawnGroupCount; }
 
 	void OnSpawn();
 	void OnAuthenticated();
@@ -382,6 +388,8 @@ class ZEPlayer
 	float m_flEntwatchHudX;
 	float m_flEntwatchHudY;
 	float m_flEntwatchHudSize;
+	int m_iCheckTransmitSpawnGroupCount;
+	int m_iClientSpawnGroupCount;
 };
 
 class CPlayerManager

src/serversideclient.h

@@ -29,7 +29,7 @@ class CHLTVServer;
 class INetMessage;
 class CNetworkGameServerBase;
 class CNetworkGameServer;
-struct CUtlSlot;
+class CUtlSlot;
 
 struct HltvReplayStats_t
 {
@@ -92,7 +92,7 @@ class CCopyableLock : public MUTEX
 	// ...
 };
 
-struct CUtlSlot
+class CUtlSlot
 {
 	CUtlVectorMT<CUtlVector<CUtlSignaller_Base*>, CCopyableLock<CThreadFastMutex> > m_ConnectedSignallers;
 
@@ -391,7 +391,7 @@ class CServerSideClient : public CServerSideClientBase
 	CClientFrameManager m_FrameManager; // 3568
 
 private:
-	[[maybe_used]] char pad3856[8]; // 3856
+	[[maybe_unused]] char pad3856[8]; // 3856
 
 public:
 	float m_flLastClientCommandQuotaStart = 0.0f;	  // 3864
@@ -412,7 +412,7 @@ class CServerSideClient : public CServerSideClientBase
 	void* m_pLastJob;								  // 4000
 
 private:
-	[[maybe_used]] char pad3984[8]; // 4008
+	[[maybe_unused]] char pad3984[8]; // 4008
 };
 
 // not full class reversed
@@ -439,7 +439,7 @@ class CHLTVClient : public CServerSideClientBase
 	bool m_bUnkBool3 = false; // 3019
 
 private:
-	[[maybe_used]] char pad3976[0x24]; // 3020
+	[[maybe_unused]] char pad3976[0x24]; // 3020
 };
 
 #endif // SERVERSIDECLIENT_H