Include recent VC users in !voicechat as well

Author: Vauff

src/commands.cpp

@@ -750,48 +750,76 @@ CON_COMMAND_F(cs2f_fullupdate, "- Force a full update for all clients.", FCVAR_L
 	g_playerManager->FullUpdateAllClients();
 }
 
+void VoiceChatPrintPlayer(CCSPlayerController* player, int slot)
+{
+	CCSPlayerController* pController = CCSPlayerController::FromSlot(slot);
+	ZEPlayer* pPlayer = g_playerManager->GetPlayer(slot);
+
+	bool bSteamIDAuthed = pPlayer->IsAuthenticated();
+	uint64 uSteamID = bSteamIDAuthed ? pPlayer->GetSteamId64() : pPlayer->GetUnauthenticatedSteamId64();
+	std::string strPlayerName = pController->GetPlayerName();
+	CPlayerUserId userId = g_pEngineServer2->GetPlayerUserId(slot);
+
+	ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "\x04%s \x06[#%hu] \x05[%llu%s\x05]", strPlayerName.c_str(), userId, uSteamID, bSteamIDAuthed ? "" : " \x02(No Auth)");
+
+	if (player)
+		ClientPrint(player, HUD_PRINTCONSOLE, CHAT_PREFIX "%s [#%hu] [%llu%s]", strPlayerName.c_str(), userId, uSteamID, bSteamIDAuthed ? "" : " (No Auth)");
+}
+
 void VoiceChatPrintCmd(const CCommand& args, CCSPlayerController* player)
 {
 	if (!GetGlobals()) return;
 
 	std::vector<int> vecActivePlayers;
+	std::vector<std::pair<int, float>> vecRecentPlayers;
+
 	for (int i = 0; i < GetGlobals()->maxClients; i++)
 	{
 		ZEPlayer* pPlayer = g_playerManager->GetPlayer(i);
 
-		if (pPlayer && !pPlayer->GetVoiceTimer().expired())
+		if (!pPlayer)
+			continue;
+
+		float flLastVoiceTime = pPlayer->GetLastVoiceTime();
+
+		if (flLastVoiceTime + 0.3f > GetGlobals()->curtime)
+		{
 			vecActivePlayers.push_back(i);
+		}
+		else if (flLastVoiceTime + 15.0f > GetGlobals()->curtime)
+		{
+			auto iter = std::lower_bound(vecRecentPlayers.begin(), vecRecentPlayers.end(), flLastVoiceTime, [](const std::pair<int, float>& recentPlayer, float flCompareVoiceTime) {
+				return recentPlayer.second < flCompareVoiceTime;
+			});
+
+			vecRecentPlayers.insert(iter, {i, flLastVoiceTime});
+		}
 	}
 
-	if (vecActivePlayers.empty())
+	if (vecActivePlayers.empty() && vecRecentPlayers.empty())
 	{
-		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "There are no players currently using voice chat.");
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "No players have recently used the voice chat.");
 		return;
 	}
 
-	ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "List of players using voice chat:");
-	if (player)
-		ClientPrint(player, HUD_PRINTCONSOLE, CHAT_PREFIX "List of players using voice chat:");
+	if (!vecRecentPlayers.empty())
+	{
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Players who recently used voice chat:");
+		if (player)
+			ClientPrint(player, HUD_PRINTCONSOLE, CHAT_PREFIX "Players who recently used voice chat:");
+
+		for (const auto& recentPlayer : vecRecentPlayers)
+			VoiceChatPrintPlayer(player, recentPlayer.first);
+	}
 
-	for (const auto& slot : vecActivePlayers)
+	if (!vecActivePlayers.empty())
 	{
-		CCSPlayerController* pController = CCSPlayerController::FromSlot(slot);
-		ZEPlayer* pPlayer = g_playerManager->GetPlayer(slot);
-
-		bool bSteamIDAuthed = pPlayer->IsAuthenticated();
-		uint64 uSteamID = bSteamIDAuthed ? pPlayer->GetSteamId64() : pPlayer->GetUnauthenticatedSteamId64();
-
-		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "\x04%s \x06[#%hu] \x05[%llu%s\x05]",
-					pController->GetPlayerName().c_str(),
-					g_pEngineServer2->GetPlayerUserId(slot),
-					uSteamID,
-					bSteamIDAuthed ? "" : " \x02(No Auth)");
-		if (!player) continue;
-		ClientPrint(player, HUD_PRINTCONSOLE, CHAT_PREFIX "%s [#%hu] [%llu%s]",
-					pController->GetPlayerName().c_str(),
-					g_pEngineServer2->GetPlayerUserId(slot),
-					uSteamID,
-					bSteamIDAuthed ? "" : " (No Auth)");
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Players using voice chat:");
+		if (player)
+			ClientPrint(player, HUD_PRINTCONSOLE, CHAT_PREFIX "Players using voice chat:");
+
+		for (int slot : vecActivePlayers)
+			VoiceChatPrintPlayer(player, slot);
 	}
 }
 

src/cs2fixes.cpp

@@ -1235,19 +1235,15 @@ bool CS2Fixes::Hook_ProcessVoiceData(const CCLCMsg_VoiceData_t& msg)
 {
 	CServerSideClient* client = META_IFACEPTR(CServerSideClient);
 
-	if (!client)
+	if (!client || !GetGlobals())
 		RETURN_META_VALUE(MRES_IGNORED, true);
 
 	ZEPlayer* pPlayer = g_playerManager->GetPlayer(client->GetPlayerSlot());
 
 	if (!pPlayer)
 		RETURN_META_VALUE(MRES_IGNORED, true);
 
-	// logic following sourcemod's implementation of OnClientSpeaking
-	if (auto timer = pPlayer->GetVoiceTimer().lock())
-		timer->Cancel();
-
-	pPlayer->SetVoiceTimer(CTimer::Create(0.3f, TIMERFLAG_NONE, []() { return -1.0f; }));
+	pPlayer->SetLastVoiceTime(GetGlobals()->curtime);
 
 	RETURN_META_VALUE(MRES_IGNORED, true);
 }

src/playermanager.h

@@ -20,7 +20,6 @@
 #pragma once
 #include "bitvec.h"
 #include "common.h"
-#include "ctimer.h"
 #include "entity/cparticlesystem.h"
 #include "entity/cpointorient.h"
 #include "entity/cpointworldtext.h"
@@ -200,6 +199,7 @@ class ZEPlayer
 		m_flEntwatchHudY = -2.0f;
 		m_flEntwatchHudSize = 60.0f;
 		m_bTopDefender = false;
+		m_flLastVoiceTime = -15.0f;
 		m_flBeaconEnabledTime = -2.0f;
 	}
 
@@ -272,7 +272,7 @@ class ZEPlayer
 	void SetEntwatchHudPos(float x, float y);
 	void SetEntwatchHudSize(float flSize);
 	void SetTopDefenderStatus(bool bStatus) { m_bTopDefender = bStatus; }
-	void SetVoiceTimer(std::weak_ptr<CTimer> timer) { m_pVoiceTimer = timer; }
+	void SetLastVoiceTime(float flTime) { m_flLastVoiceTime = flTime; }
 	void SetBeaconEnabledTime(float flTime) { m_flBeaconEnabledTime = flTime; }
 
 	uint64 GetAdminFlags() { return m_iAdminFlags; }
@@ -324,7 +324,7 @@ class ZEPlayer
 	float GetEntwatchHudY() { return m_flEntwatchHudY; }
 	float GetEntwatchHudSize() { return m_flEntwatchHudSize; }
 	bool GetTopDefenderStatus() { return m_bTopDefender; }
-	std::weak_ptr<CTimer> GetVoiceTimer() { return m_pVoiceTimer; }
+	float GetLastVoiceTime() { return m_flLastVoiceTime; }
 	float GetBeaconEnabledTime() { return m_flBeaconEnabledTime; }
 
 	void OnSpawn();
@@ -400,7 +400,7 @@ class ZEPlayer
 	float m_flEntwatchHudY;
 	float m_flEntwatchHudSize;
 	bool m_bTopDefender;
-	std::weak_ptr<CTimer> m_pVoiceTimer;
+	float m_flLastVoiceTime;
 	float m_flBeaconEnabledTime;
 };