Improve clan tag handling

No more stutters!

Author: Vauff

src/cs2_sdk/entity/cbaseplayercontroller.h

@@ -41,7 +41,7 @@ class CBasePlayerController : public CBaseEntity
 
 	SCHEMA_FIELD(uint64, m_steamID)
 	SCHEMA_FIELD(CHandle<CBasePlayerPawn>, m_hPawn)
-	SCHEMA_FIELD_POINTER(char, m_iszPlayerName)
+	SCHEMA_FIELD_POINTER(char, m_iszPlayerName) // char m_iszPlayerName[128]
 	SCHEMA_FIELD(PlayerConnectedState, m_iConnected)
 	SCHEMA_FIELD(bool, m_bIsHLTV)
 	SCHEMA_FIELD(uint, m_iDesiredFOV)

src/cs2_sdk/entity/ccsplayercontroller.h

@@ -33,7 +33,6 @@ class CCSPlayerController : public CBasePlayerController
 	SCHEMA_FIELD(CCSPlayerController_ActionTrackingServices*, m_pActionTrackingServices)
 	SCHEMA_FIELD(uint32_t, m_iPing)
 	SCHEMA_FIELD(CUtlSymbolLarge, m_szClan)
-	SCHEMA_FIELD_POINTER(char, m_szClanName) // char m_szClanName[32]
 	SCHEMA_FIELD(bool, m_bEverFullyConnected)
 	SCHEMA_FIELD(bool, m_bPawnIsAlive)
 	SCHEMA_FIELD(int32_t, m_nDisconnectionTick)
@@ -144,4 +143,24 @@ class CCSPlayerController : public CBasePlayerController
 	{
 		m_iScore() = m_iScore() + iScore;
 	}
+
+	void SetClanTag(const char* pszClanTag)
+	{
+		// Skip if clan tag is unchanged, since name swap trick has a bit of overhead
+		if (!V_strcmp(m_szClan().String(), pszClanTag))
+			return;
+
+		m_szClan = g_pEntitySystem->AllocPooledString(pszClanTag);
+
+		// This name swap trick is necessary to get clients to display the new clan tag
+		std::string strName = GetPlayerName();
+
+		if (!strName.empty() && strName.back() == ' ')
+			strName.pop_back();
+		else
+			strName.push_back(' ');
+
+		V_strncpy(m_iszPlayerName, strName.c_str(), 128);
+		m_iszPlayerName.NetworkStateChanged();
+	}
 };

src/entwatch.cpp

@@ -798,14 +798,12 @@ void EWItemInstance::Pickup(int slot)
 		if (bShouldSetClantag)
 		{
 			bHasThisClantag = true;
-			pController->m_szClan(sClantag);
+			pController->SetClanTag(sClantag);
 			if (g_cvarItemHolderScore.Get() > -1)
 			{
 				int score = pController->m_iScore + g_cvarItemHolderScore.Get();
 				pController->m_iScore = score;
 			}
-
-			EW_UpdateClientClanTags();
 		}
 	}
 
@@ -840,7 +838,7 @@ void EWItemInstance::Drop(EWDropReason reason, CCSPlayerController* pController)
 			{
 				// Player IS holding another item, score doesnt need adjusting
 
-				pController->m_szClan(g_pEWHandler->vecItems[otherItem]->sClantag);
+				pController->SetClanTag(g_pEWHandler->vecItems[otherItem]->sClantag);
 				g_pEWHandler->vecItems[otherItem]->bHasThisClantag = true;
 				bSetAnotherClantag = true;
 				break;
@@ -857,10 +855,8 @@ void EWItemInstance::Drop(EWDropReason reason, CCSPlayerController* pController)
 				pController->m_iScore = score;
 			}
 
-			pController->m_szClan("");
+			pController->SetClanTag("");
 		}
-
-		EW_UpdateClientClanTags();
 	}
 
 	char sPlayerInfo[64];
@@ -1504,10 +1500,8 @@ void CEWHandler::ResetAllClantags()
 			pController->m_iScore = score;
 		}
 
-		pController->m_szClan("");
+		pController->SetClanTag("");
 	}
-
-	EW_UpdateClientClanTags();
 }
 
 int CEWHandler::RegisterItem(CBasePlayerWeapon* pWeapon)
@@ -2259,49 +2253,6 @@ void EW_PlayerDisconnect(int slot)
 	g_pEWHandler->PlayerDrop(EWDropReason::Disconnect, -1, pController);
 }
 
-// An event needs to be sent to force clients to see up to date clantags
-void EW_UpdateClientClanTags()
-{
-	// Cannot send this event during map vote, as it breaks voting client side
-	if (!GetGlobals() || !g_pMapVoteSystem->IsIntermissionAllowed())
-		return;
-
-	static IGameEvent* pEvent = nullptr;
-
-	if (!pEvent)
-		pEvent = g_gameEventManager->CreateEvent("nextlevel_changed");
-
-	if (!pEvent)
-	{
-		Panic("Failed to create nextlevel_changed event\n");
-		return;
-	}
-
-	INetworkMessageInternal* pMsg = g_pNetworkMessages->FindNetworkMessageById(GE_Source1LegacyGameEvent);
-	if (!pMsg)
-	{
-		Panic("Failed to create Source1LegacyGameEvent\n");
-		return;
-	}
-	CNetMessagePB<CMsgSource1LegacyGameEvent>* data = pMsg->AllocateMessage()->ToPB<CMsgSource1LegacyGameEvent>();
-	g_gameEventManager->SerializeEvent(pEvent, data);
-
-	CRecipientFilter filter;
-	for (int i = 0; i < GetGlobals()->maxClients; i++)
-	{
-		ZEPlayer* pPlayer = g_playerManager->GetPlayer(i);
-
-		if (!pPlayer || pPlayer->IsFakeClient() || !pPlayer->IsAuthenticated())
-			continue;
-
-		if (pPlayer->GetEntwatchClangtags())
-			filter.AddRecipient(pPlayer->GetPlayerSlot());
-	}
-
-	g_gameEventSystem->PostEventAbstract(-1, false, &filter, pMsg, data, 0);
-	delete data;
-}
-
 bool EW_IsFireOutputHooked()
 {
 	return std::any_of(mapIOFunctions.begin(), mapIOFunctions.end(), [](const auto& p) { return p.first == "entwatch"; });
@@ -2650,34 +2601,6 @@ CON_COMMAND_CHAT(ew_dump, "- Prints the currently loaded config to console")
 	g_pEWHandler->PrintLoadedConfig(player->GetPlayerSlot());
 }
 
-CON_COMMAND_CHAT(etag, "- Toggle EntWatch clantags on the scoreboard")
-{
-	if (!g_cvarEnableEntWatch.Get())
-		return;
-
-	if (!player)
-	{
-		ClientPrint(player, HUD_PRINTTALK, EW_PREFIX "Only usable in game.");
-		return;
-	}
-
-	ZEPlayer* zpPlayer = g_playerManager->GetPlayer(player->GetPlayerSlot());
-	if (!zpPlayer)
-	{
-		ClientPrint(player, HUD_PRINTTALK, EW_PREFIX "Something went wrong, try again later.");
-		return;
-	}
-
-	bool bCurrentStatus = zpPlayer->GetEntwatchClangtags();
-	bCurrentStatus = !bCurrentStatus;
-	zpPlayer->SetEntwatchClangtags(bCurrentStatus);
-
-	if (bCurrentStatus)
-		ClientPrint(player, HUD_PRINTTALK, EW_PREFIX "You have\x04 Enabled\x01 EntWatch clantag updates");
-	else
-		ClientPrint(player, HUD_PRINTTALK, EW_PREFIX "You have\x07 Disabled\x01 EntWatch clantag updates");
-}
-
 CON_COMMAND_CHAT(hud, "- Toggle EntWatch HUD")
 {
 	if (!g_cvarEnableEntWatch.Get())

src/entwatch.h

@@ -36,7 +36,6 @@ extern CConVar<bool> g_cvarEnableEntwatchHud;
 #define EW_PREFIX " \4[EntWatch]\1 "
 
 #define EW_PREF_HUD_MODE "entwatch_hud"
-#define EW_PREF_CLANTAG "entwatch_clantag"
 #define EW_PREF_HUDPOS_X "entwatch_hudpos_x"
 #define EW_PREF_HUDPOS_Y "entwatch_hudpos_y"
 #define EW_PREF_HUDCOLOR "entwatch_hudcolor"
@@ -297,7 +296,6 @@ void EW_DropWeapon(CCSPlayer_WeaponServices* pWeaponServices, CBasePlayerWeapon*
 void EW_PlayerDeath(IGameEvent* pEvent);
 void EW_PlayerDeathPre(CCSPlayerController* pController);
 void EW_PlayerDisconnect(int slot);
-void EW_UpdateClientClanTags();
 bool EW_IsFireOutputHooked();
 void EW_FireOutput(const CEntityIOOutput* pThis, CEntityInstance* pActivator, CEntityInstance* pCaller, const CVariant* value, float flDelay);
 int GetTemplateSuffixNumber(const char* szName);

src/playermanager.cpp

@@ -715,12 +715,6 @@ void ZEPlayer::SetEntwatchHudMode(int iMode)
 	g_pUserPreferencesSystem->SetPreferenceInt(m_slot.Get(), EW_PREF_HUD_MODE, m_iEntwatchHudMode);
 }
 
-void ZEPlayer::SetEntwatchClangtags(bool bStatus)
-{
-	m_bEntwatchClantags = bStatus;
-	g_pUserPreferencesSystem->SetPreferenceInt(m_slot.Get(), EW_PREF_CLANTAG, bStatus ? 1 : 0);
-}
-
 void ZEPlayer::SetEntwatchHudColor(Color colorHud)
 {
 	m_colorEntwatchHud = colorHud;

src/playermanager.h

@@ -192,7 +192,6 @@ class ZEPlayer
 		m_pActiveZRModel = nullptr;
 		m_iButtonWatchMode = 0;
 		m_iEntwatchHudMode = 0;
-		m_bEntwatchClantags = true;
 		m_colorEntwatchHud = Color(255, 255, 255, 255);
 		m_flEntwatchHudX = -7.5f;
 		m_flEntwatchHudY = -2.0f;
@@ -261,7 +260,6 @@ class ZEPlayer
 	void SetActiveZRClass(std::shared_ptr<ZRClass> pZRModel) { m_pActiveZRClass = pZRModel; }
 	void SetActiveZRModel(std::shared_ptr<ZRModelEntry> pZRClass) { m_pActiveZRModel = pZRClass; }
 	void SetEntwatchHudMode(int iMode);
-	void SetEntwatchClangtags(bool bStatus);
 	void SetPointOrient(CPointOrient* pOrient) { m_hPointOrient.Set(pOrient); }
 	void SetEntwatchHud(CPointWorldText* pWorldText) { m_hEntwatchHud.Set(pWorldText); }
 	void SetEntwatchHudColor(Color colorHud);
@@ -309,7 +307,6 @@ class ZEPlayer
 	std::shared_ptr<ZRModelEntry> GetActiveZRModel() { return m_pActiveZRModel; }
 	int GetButtonWatchMode();
 	int GetEntwatchHudMode();
-	bool GetEntwatchClangtags() { return m_bEntwatchClantags; }
 	CPointOrient* GetPointOrient() { return m_hPointOrient.Get(); }
 	CPointWorldText* GetEntwatchHud() { return m_hEntwatchHud.Get(); }
 	Color GetEntwatchHudColor() { return m_colorEntwatchHud; }
@@ -384,7 +381,6 @@ class ZEPlayer
 	CHandle<CPointOrient> m_hPointOrient;
 	CHandle<CPointWorldText> m_hEntwatchHud;
 	int m_iEntwatchHudMode;
-	bool m_bEntwatchClantags;
 	Color m_colorEntwatchHud;
 	float m_flEntwatchHudX;
 	float m_flEntwatchHudY;

src/user_preferences.cpp

@@ -116,7 +116,6 @@ void CUserPreferencesSystem::OnPutPreferences(int iSlot)
 
 	// EntWatch
 	int iEntwatchMode = GetPreferenceInt(iSlot, EW_PREF_HUD_MODE, 0);
-	bool bEntwatchClantag = (bool)GetPreferenceInt(iSlot, EW_PREF_CLANTAG, 1);
 	float flEntwatchHudposX = GetPreferenceFloat(iSlot, EW_PREF_HUDPOS_X, EW_HUDPOS_X_DEFAULT);
 	float flEntwatchHudposY = GetPreferenceFloat(iSlot, EW_PREF_HUDPOS_Y, EW_HUDPOS_Y_DEFAULT);
 	Color ewHudColor;
@@ -137,7 +136,6 @@ void CUserPreferencesSystem::OnPutPreferences(int iSlot)
 
 	// Set EntWatch
 	player->SetEntwatchHudMode(iEntwatchMode);
-	player->SetEntwatchClangtags(bEntwatchClantag);
 	player->SetEntwatchHudPos(flEntwatchHudposX, flEntwatchHudposY);
 	player->SetEntwatchHudColor(ewHudColor);
 	player->SetEntwatchHudSize(flEntwatchHudSize);