Fixed player death webhook not displaying player name.

OrsellGit · OrsellGit · commit 38f31902db2d · 2025-03-22T12:29:32.000-07:00
diff --git a/commands.cpp b/commands.cpp
@@ -14,7 +14,7 @@
 //---------------------------------------------------------------------------------
 // Core P2:MM ConVars | These shouldn't be modified manually. Hidden to prevent accidentally breaking something.
 //---------------------------------------------------------------------------------
-ConVar p2mm_loop("p2mm_loop", "0", FCVAR_HIDDEN, "Flag if P2MMLoop should be looping.");
+ConVar p2mm_loop("p2mm_loop", "0", FCVAR_HIDDEN, "Flag if P2MMLoop should be looping."); //! REMOVE THIS AT SOME POINT!!!
 ConVar p2mm_lastmap("p2mm_lastmap", "", FCVAR_HIDDEN, "Last map recorded for the Last Map system.");
 ConVar p2mm_splitscreen("p2mm_splitscreen", "0", FCVAR_HIDDEN, "Flag for the main menu buttons and launcher to start in splitscreen or not.");
 
diff --git a/discordrpc.cpp b/discordrpc.cpp
@@ -103,12 +103,12 @@ static void WebhookCheck(IConVar* var, const char* pOldValue, float flOldValue)
 		}
 	}
 }
-ConVar p2mm_discord_webhooks("p2mm_discord_webhooks", "0", FCVAR_NOTIFY, "Enable or disable webhooks been the P2:MM Server and Discord.", true, 0, true, 1, WebhookCheck);
-ConVar p2mm_discord_webhooks_url("p2mm_discord_webhooks_url", "", FCVAR_HIDDEN, "Channel webhook URL to send messages to. Should be set in launcher, not here.");
+ConVar p2mm_discord_webhooks("p2mm_discord_webhooks", "0", FCVAR_NOTIFY, "Enable or disable webhooks between the P2:MM Server and Discord.", true, 0, true, 1, WebhookCheck);
+ConVar p2mm_discord_webhooks_url("p2mm_discord_webhooks_url", "", FCVAR_HIDDEN, "Channel webhook URL. Recommended to be set in launcher, not here.");
 ConVar p2mm_discord_webhooks_defaultfooter("p2mm_discord_webhooks_defaultfooter", "1", FCVAR_NONE, "Enable or disable the default embed footer for webhooks.", true, 0, true, 1);
 ConVar p2mm_discord_webhooks_customfooter("p2mm_discord_webhooks_customfooter", "", FCVAR_NONE, "Set a custom embed footer for webhook messages.");
 
-// Parameters that are sent through to the Discord webhook
+// Parameters that are sent through to the Discord webhook.
 struct WebHookParams
 {
 	std::string title = "Unknown";
@@ -117,11 +117,12 @@ struct WebHookParams
 	std::string footer;
 };
 
-// Generates a footer with the player count with max allowed client count and also the current map name
+// Generates a footer with the player count with max allowed client count and also the current map name.
 static std::string DefaultFooter()
 {
 	// g_pGlobals doesn't exist yet at certain situations, so return a blank string.
-	if (!g_pGlobals) return "";
+	if (!g_pGlobals)
+		return "";
 
 	const std::string curPlayerCount = std::to_string(CURPLAYERCOUNT());
 	const std::string maxPlayerCount = std::to_string(MAX_PLAYERS);
diff --git a/p2mm.cpp b/p2mm.cpp
@@ -566,8 +566,8 @@ void CP2MMServerPlugin::LevelInit(char const* pMapName)
 
 	if (!g_P2MMServerPlugin.m_bSeenFirstRunPrompt) return;
 
-	std::string changeMapStr = std::string("The server has changed the map to: `" + std::string(CURMAPFILENAME) + "`");
-	g_pDiscordIntegration->SendWebHookEmbed("Server", changeMapStr, EMBED_COLOR_SERVER, false);
+	const auto changeMapStr = std::string("The server has changed the map to: `" + std::string(CURMAPFILENAME) + "`");
+	CDiscordIntegration::SendWebHookEmbed("Server", changeMapStr, EMBED_COLOR_SERVER, false);
 
 	// Update Discord RPC to update current map information.
 	CDiscordIntegration::UpdateDiscordRPC();
@@ -780,12 +780,12 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 	// Event called when a player dies, "player_death" returns:	
 	/*
 		"userid"	"int"   	// user ID who died
-		"attacker"	"short"	 	// user ID who killed
+		"attacker"	"int"	 	// user ID who killed
 	*/
 	if (FStrEq(event->GetName(), "player_death"))
 	{
 		int userid = event->GetInt("userid");
-		short attacker = event->GetInt("attacker");
+		int attacker = event->GetInt("attacker");
 		int entindex = UserIDToPlayerIndex(userid);
 
 		if (g_pScriptVM)
@@ -796,13 +796,14 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 				if (HSCRIPT playerHandle = INDEXHANDLE(entindex))
 				{
 					g_pScriptVM->Call<HSCRIPT>(od_func, nullptr, false, nullptr, playerHandle);
-					g_pDiscordIntegration->SendWebHookEmbed(std::string(GetPlayerName(entindex) + std::string(" Died!")), "", EMBED_COLOR_PLAYERDEATH);
+					std::string playerName = GetPlayerName(entindex);
+					CDiscordIntegration::SendWebHookEmbed(playerName + std::string(" Died!"), "", EMBED_COLOR_PLAYERDEATH);
 				}
 			}
 
 			// Handle VScript game event function
 			if (HSCRIPT geFunc = g_pScriptVM->LookupFunction("GEPlayerDeath"))
-				g_pScriptVM->Call<int, short, int>(geFunc, nullptr, false, nullptr, userid, attacker, entindex);
+				g_pScriptVM->Call<int, int, int>(geFunc, nullptr, false, nullptr, userid, attacker, entindex);
 		}
 
 		if (spewInfo)
@@ -869,7 +870,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 			if (HSCRIPT geFunc = g_pScriptVM->LookupFunction("GEPlayerConnect"))
 			{
 				g_pScriptVM->Call<const char*, int, int, const char*, const char*, const char*, bool, int>(geFunc, nullptr, false, nullptr, name, index, userid, xuid, networkid, address, bot, entindex);
-				g_pDiscordIntegration->SendWebHookEmbed(std::string(name + std::string(" Joined!")), std::string(name + std::string(" joined the server!")));
+				CDiscordIntegration::SendWebHookEmbed(std::string(name + std::string(" Joined!")), std::string(name + std::string(" joined the server!")));
 			}
 		}
 
@@ -964,7 +965,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 						pos += std::string("\\\\").length();
 					}
 					if (!chatMsg.starts_with("!"))
-						g_pDiscordIntegration->SendWebHookEmbed(playerName, chatMsg);
+						CDiscordIntegration::SendWebHookEmbed(playerName, chatMsg);
 				}
 			}
 
@@ -1048,7 +1049,7 @@ extern void UpdateMapsList();
 void CP2MMServerPlugin::LevelShutdown(void)
 {
 	P2MMLog(INFO, true, "Level Shutdown! Map: %s", CURMAPFILENAME);
-	p2mm_loop.SetValue("0"); // REMOVE THIS at some point...
+	p2mm_loop.SetValue("0"); //! REMOVE THIS at some point...
 	UpdateMapsList(); // Update the maps list for p2mm_map.
 	// Update Discord RPC to update the level information or to say the host is on the main menu.
 	CDiscordIntegration::UpdateDiscordRPC();
diff --git a/vscript.cpp b/vscript.cpp
@@ -4,7 +4,6 @@
 // Purpose: Portal 2: Multiplayer Mod server plugin
 // 
 //===========================================================================//
-#pragma once
 
 #include "sdk.hpp"
 #include "commands.hpp"
@@ -16,7 +15,7 @@
 //---------------------------------------------------------------------------------
 // Purpose: Logging for the P2MM VScript. The log message must be passed as a string or it will error.
 //---------------------------------------------------------------------------------
-static void printlP2MM(int level, bool dev, const char* pMsgFormat)
+static void printlP2MM(const int level, const bool dev, const char* pMsgFormat)
 {
 	if (dev && !p2mm_developer.GetBool()) return;
 
@@ -77,8 +76,7 @@ static void InitializeEntity(HSCRIPT ent)
 {
 	static uintptr_t func = (uintptr_t)Memory::Scanner::Scan<void*>(SERVERDLL, "E8 ?? ?? ?? ?? 8B 4D 18 8B 57 5C", 1);
 	static auto GetCBaseEntityScriptDesc = reinterpret_cast<ScriptClassDesc_t* (__cdecl*)()>(*reinterpret_cast<uintptr_t*>(func) + func + sizeof(func));
-	void* pEntity = reinterpret_cast<void*>(g_pScriptVM->GetInstanceValue(ent, GetCBaseEntityScriptDesc()));;
-	if (pEntity)
+	if (void* pEntity = reinterpret_cast<void*>(g_pScriptVM->GetInstanceValue(ent, GetCBaseEntityScriptDesc())))
 	{
 		g_pServerTools->DispatchSpawn(pEntity);
 
@@ -102,8 +100,7 @@ static void SendToChat(int playerIndex, const char* msg)
 			player_info_t playerInfo;
 			if (engineServer->GetPlayerInfo(i, &playerInfo))
 			{
-				CBasePlayer* pPlayer = UTIL_PlayerByIndex(i);
-				if (pPlayer) 
+				if (CBasePlayer* pPlayer = UTIL_PlayerByIndex(i)) 
 				{
 					UTIL_ClientPrint(pPlayer, HUD_PRINTTALK, msg);
 				}
@@ -175,7 +172,7 @@ static void CallFirstRunPrompt()
 //			Specifying no playerIndex or 0 sends to all players.
 //			Supports printing localization strings but those that require formatting can't be formatted.
 //---------------------------------------------------------------------------------
-void ConsolePrint(int playerIndex, const char* msg)
+static void ConsolePrint(int playerIndex, const char* msg)
 {
 	if (!msg) return;
 
@@ -186,8 +183,7 @@ void ConsolePrint(int playerIndex, const char* msg)
 			player_info_t playerInfo;
 			if (engineServer->GetPlayerInfo(i, &playerInfo))
 			{
-				CBasePlayer* pPlayer = UTIL_PlayerByIndex(i);
-				if (pPlayer)
+				if (CBasePlayer* pPlayer = UTIL_PlayerByIndex(i))
 				{
 					UTIL_ClientPrint(pPlayer, HUD_PRINTCONSOLE, msg);
 				}
@@ -212,7 +208,7 @@ void ConsolePrint(int playerIndex, const char* msg)
 //			Specifying no playerIndex or 0 sends to all players.
 //			Supports printing localization strings but those that require formatting can't be formatted.
 //---------------------------------------------------------------------------------
-void ClientPrint(int playerIndex, const char* msg)
+static void ClientPrint(int playerIndex, const char* msg)
 {
 	if (!msg) return;
 
@@ -223,8 +219,7 @@ void ClientPrint(int playerIndex, const char* msg)
 			player_info_t playerInfo;
 			if (engineServer->GetPlayerInfo(i, &playerInfo))
 			{
-				CBasePlayer* pPlayer = UTIL_PlayerByIndex(i);
-				if (pPlayer)
+				if (CBasePlayer* pPlayer = UTIL_PlayerByIndex(i))
 				{
 					UTIL_ClientPrint(pPlayer, HUD_PRINTTALK, msg);
 				}
@@ -252,7 +247,7 @@ void ClientPrint(int playerIndex, const char* msg)
 //			Vector is used to consolidate x, y, and channel parameters together.
 //			Vector is used to consolidate fadeinTime, fadeoutTime, and holdTime.
 //---------------------------------------------------------------------------------
-void HudPrint
+static void HudPrint
 	(
 	int playerIndex, const char* msg, 
 	Vector posChannel, int effect, float fxTime,
@@ -282,7 +277,7 @@ void HudPrint
 
 	if (!playerIndex)
 	{
-		UTIL_HudMessage(NULL, hudTextParams, msg);
+		UTIL_HudMessage(nullptr, hudTextParams, msg);
 		return;
 	}
 
@@ -299,15 +294,15 @@ void HudPrint
 //---------------------------------------------------------------------------------
 // Purpose: Self-explanatory.
 //---------------------------------------------------------------------------------
-int GetMaxPlayers()
+static int GetMaxPlayers()
 {
 	return MAX_PLAYERS;
 }
 
 //---------------------------------------------------------------------------------
 // Purpose: Enable or disable displaying the score board for a player.
 //---------------------------------------------------------------------------------
-void ShowScoreboard(int playerIndex, bool bEnable)
+static void ShowScoreboard(int playerIndex, bool bEnable)
 {
 	CBasePlayer__ShowViewPortPanel(playerIndex, "scores", bEnable);
 }

Original file line number	Diff line number	Diff line change
`@@ -103,12 +103,12 @@ static void WebhookCheck(IConVar* var, const char* pOldValue, float flOldValue)`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`-ConVar p2mm_discord_webhooks("p2mm_discord_webhooks", "0", FCVAR_NOTIFY, "Enable or disable webhooks been the P2:MM Server and Discord.", true, 0, true, 1, WebhookCheck);`
`107`		`-ConVar p2mm_discord_webhooks_url("p2mm_discord_webhooks_url", "", FCVAR_HIDDEN, "Channel webhook URL to send messages to. Should be set in launcher, not here.");`
	`106`	`+ConVar p2mm_discord_webhooks("p2mm_discord_webhooks", "0", FCVAR_NOTIFY, "Enable or disable webhooks between the P2:MM Server and Discord.", true, 0, true, 1, WebhookCheck);`
	`107`	`+ConVar p2mm_discord_webhooks_url("p2mm_discord_webhooks_url", "", FCVAR_HIDDEN, "Channel webhook URL. Recommended to be set in launcher, not here.");`
`108`	`108`	`ConVar p2mm_discord_webhooks_defaultfooter("p2mm_discord_webhooks_defaultfooter", "1", FCVAR_NONE, "Enable or disable the default embed footer for webhooks.", true, 0, true, 1);`
`109`	`109`	`ConVar p2mm_discord_webhooks_customfooter("p2mm_discord_webhooks_customfooter", "", FCVAR_NONE, "Set a custom embed footer for webhook messages.");`
`110`	`110`
`111`		`-// Parameters that are sent through to the Discord webhook`
	`111`	`+// Parameters that are sent through to the Discord webhook.`
`112`	`112`	`struct WebHookParams`
`113`	`113`	`{`
`114`	`114`	`std::string title = "Unknown";`
`@@ -117,11 +117,12 @@ struct WebHookParams`
`117`	`117`	`std::string footer;`
`118`	`118`	`};`
`119`	`119`
`120`		`-// Generates a footer with the player count with max allowed client count and also the current map name`
	`120`	`+// Generates a footer with the player count with max allowed client count and also the current map name.`
`121`	`121`	`static std::string DefaultFooter()`
`122`	`122`	`{`
`123`	`123`	`// g_pGlobals doesn't exist yet at certain situations, so return a blank string.`
`124`		`- if (!g_pGlobals) return "";`
	`124`	`+ if (!g_pGlobals)`
	`125`	`+ return "";`
`125`	`126`
`126`	`127`	`const std::string curPlayerCount = std::to_string(CURPLAYERCOUNT());`
`127`	`128`	`const std::string maxPlayerCount = std::to_string(MAX_PLAYERS);`
Original file line number	Diff line number	Diff line change
`@@ -566,8 +566,8 @@ void CP2MMServerPlugin::LevelInit(char const* pMapName)`
`566`	`566`
`567`	`567`	`if (!g_P2MMServerPlugin.m_bSeenFirstRunPrompt) return;`
`568`	`568`
`569`		- std::string changeMapStr = std::string("The server has changed the map to: `" + std::string(CURMAPFILENAME) + "`");
`570`		`- g_pDiscordIntegration->SendWebHookEmbed("Server", changeMapStr, EMBED_COLOR_SERVER, false);`
	`569`	+ const auto changeMapStr = std::string("The server has changed the map to: `" + std::string(CURMAPFILENAME) + "`");
	`570`	`+ CDiscordIntegration::SendWebHookEmbed("Server", changeMapStr, EMBED_COLOR_SERVER, false);`
`571`	`571`
`572`	`572`	`// Update Discord RPC to update current map information.`
`573`	`573`	`CDiscordIntegration::UpdateDiscordRPC();`
`@@ -780,12 +780,12 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`780`	`780`	`// Event called when a player dies, "player_death" returns:`
`781`	`781`	`/*`
`782`	`782`	`"userid" "int" // user ID who died`
`783`		`- "attacker" "short" // user ID who killed`
	`783`	`+ "attacker" "int" // user ID who killed`
`784`	`784`	`*/`
`785`	`785`	`if (FStrEq(event->GetName(), "player_death"))`
`786`	`786`	`{`
`787`	`787`	`int userid = event->GetInt("userid");`
`788`		`- short attacker = event->GetInt("attacker");`
	`788`	`+ int attacker = event->GetInt("attacker");`
`789`	`789`	`int entindex = UserIDToPlayerIndex(userid);`
`790`	`790`
`791`	`791`	`if (g_pScriptVM)`
`@@ -796,13 +796,14 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`796`	`796`	`if (HSCRIPT playerHandle = INDEXHANDLE(entindex))`
`797`	`797`	`{`
`798`	`798`	`g_pScriptVM->Call<HSCRIPT>(od_func, nullptr, false, nullptr, playerHandle);`
`799`		`- g_pDiscordIntegration->SendWebHookEmbed(std::string(GetPlayerName(entindex) + std::string(" Died!")), "", EMBED_COLOR_PLAYERDEATH);`
	`799`	`+ std::string playerName = GetPlayerName(entindex);`
	`800`	`+ CDiscordIntegration::SendWebHookEmbed(playerName + std::string(" Died!"), "", EMBED_COLOR_PLAYERDEATH);`
`800`	`801`	`}`
`801`	`802`	`}`
`802`	`803`
`803`	`804`	`// Handle VScript game event function`
`804`	`805`	`if (HSCRIPT geFunc = g_pScriptVM->LookupFunction("GEPlayerDeath"))`
`805`		`- g_pScriptVM->Call<int, short, int>(geFunc, nullptr, false, nullptr, userid, attacker, entindex);`
	`806`	`+ g_pScriptVM->Call<int, int, int>(geFunc, nullptr, false, nullptr, userid, attacker, entindex);`
`806`	`807`	`}`
`807`	`808`
`808`	`809`	`if (spewInfo)`
`@@ -869,7 +870,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`869`	`870`	`if (HSCRIPT geFunc = g_pScriptVM->LookupFunction("GEPlayerConnect"))`
`870`	`871`	`{`
`871`	`872`	`g_pScriptVM->Call<const char, int, int, const char, const char, const char, bool, int>(geFunc, nullptr, false, nullptr, name, index, userid, xuid, networkid, address, bot, entindex);`
`872`		`- g_pDiscordIntegration->SendWebHookEmbed(std::string(name + std::string(" Joined!")), std::string(name + std::string(" joined the server!")));`
	`873`	`+ CDiscordIntegration::SendWebHookEmbed(std::string(name + std::string(" Joined!")), std::string(name + std::string(" joined the server!")));`
`873`	`874`	`}`
`874`	`875`	`}`
`875`	`876`
`@@ -964,7 +965,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`964`	`965`	`pos += std::string("\\\\").length();`
`965`	`966`	`}`
`966`	`967`	`if (!chatMsg.starts_with("!"))`
`967`		`- g_pDiscordIntegration->SendWebHookEmbed(playerName, chatMsg);`
	`968`	`+ CDiscordIntegration::SendWebHookEmbed(playerName, chatMsg);`
`968`	`969`	`}`
`969`	`970`	`}`
`970`	`971`
`@@ -1048,7 +1049,7 @@ extern void UpdateMapsList();`
`1048`	`1049`	`void CP2MMServerPlugin::LevelShutdown(void)`
`1049`	`1050`	`{`
`1050`	`1051`	`P2MMLog(INFO, true, "Level Shutdown! Map: %s", CURMAPFILENAME);`
`1051`		`- p2mm_loop.SetValue("0"); // REMOVE THIS at some point...`
	`1052`	`+ p2mm_loop.SetValue("0"); //! REMOVE THIS at some point...`
`1052`	`1053`	`UpdateMapsList(); // Update the maps list for p2mm_map.`
`1053`	`1054`	`// Update Discord RPC to update the level information or to say the host is on the main menu.`
`1054`	`1055`	`CDiscordIntegration::UpdateDiscordRPC();`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`// Purpose: Portal 2: Multiplayer Mod server plugin`
`5`	`5`	`//`
`6`	`6`	`//===========================================================================//`
`7`		`-#pragma once`
`8`	`7`
`9`	`8`	`#include "sdk.hpp"`
`10`	`9`	`#include "commands.hpp"`
`@@ -16,7 +15,7 @@`
`16`	`15`	`//---------------------------------------------------------------------------------`
`17`	`16`	`// Purpose: Logging for the P2MM VScript. The log message must be passed as a string or it will error.`
`18`	`17`	`//---------------------------------------------------------------------------------`
`19`		`-static void printlP2MM(int level, bool dev, const char* pMsgFormat)`
	`18`	`+static void printlP2MM(const int level, const bool dev, const char* pMsgFormat)`
`20`	`19`	`{`
`21`	`20`	`if (dev && !p2mm_developer.GetBool()) return;`
`22`	`21`
`@@ -77,8 +76,7 @@ static void InitializeEntity(HSCRIPT ent)`
`77`	`76`	`{`
`78`	`77`	`static uintptr_t func = (uintptr_t)Memory::Scanner::Scan<void*>(SERVERDLL, "E8 ?? ?? ?? ?? 8B 4D 18 8B 57 5C", 1);`
`79`	`78`	`static auto GetCBaseEntityScriptDesc = reinterpret_cast<ScriptClassDesc_t* (__cdecl)()>(reinterpret_cast<uintptr_t*>(func) + func + sizeof(func));`
`80`		`- void* pEntity = reinterpret_cast<void*>(g_pScriptVM->GetInstanceValue(ent, GetCBaseEntityScriptDesc()));;`
`81`		`- if (pEntity)`
	`79`	`+ if (void* pEntity = reinterpret_cast<void*>(g_pScriptVM->GetInstanceValue(ent, GetCBaseEntityScriptDesc())))`
`82`	`80`	`{`
`83`	`81`	`g_pServerTools->DispatchSpawn(pEntity);`
`84`	`82`
`@@ -102,8 +100,7 @@ static void SendToChat(int playerIndex, const char* msg)`
`102`	`100`	`player_info_t playerInfo;`
`103`	`101`	`if (engineServer->GetPlayerInfo(i, &playerInfo))`
`104`	`102`	`{`
`105`		`- CBasePlayer* pPlayer = UTIL_PlayerByIndex(i);`
`106`		`- if (pPlayer)`
	`103`	`+ if (CBasePlayer* pPlayer = UTIL_PlayerByIndex(i))`
`107`	`104`	`{`
`108`	`105`	`UTIL_ClientPrint(pPlayer, HUD_PRINTTALK, msg);`
`109`	`106`	`}`
`@@ -175,7 +172,7 @@ static void CallFirstRunPrompt()`
`175`	`172`	`// Specifying no playerIndex or 0 sends to all players.`
`176`	`173`	`// Supports printing localization strings but those that require formatting can't be formatted.`
`177`	`174`	`//---------------------------------------------------------------------------------`
`178`		`-void ConsolePrint(int playerIndex, const char* msg)`
	`175`	`+static void ConsolePrint(int playerIndex, const char* msg)`
`179`	`176`	`{`
`180`	`177`	`if (!msg) return;`
`181`	`178`
`@@ -186,8 +183,7 @@ void ConsolePrint(int playerIndex, const char* msg)`
`186`	`183`	`player_info_t playerInfo;`
`187`	`184`	`if (engineServer->GetPlayerInfo(i, &playerInfo))`
`188`	`185`	`{`
`189`		`- CBasePlayer* pPlayer = UTIL_PlayerByIndex(i);`
`190`		`- if (pPlayer)`
	`186`	`+ if (CBasePlayer* pPlayer = UTIL_PlayerByIndex(i))`
`191`	`187`	`{`
`192`	`188`	`UTIL_ClientPrint(pPlayer, HUD_PRINTCONSOLE, msg);`
`193`	`189`	`}`
`@@ -212,7 +208,7 @@ void ConsolePrint(int playerIndex, const char* msg)`
`212`	`208`	`// Specifying no playerIndex or 0 sends to all players.`
`213`	`209`	`// Supports printing localization strings but those that require formatting can't be formatted.`
`214`	`210`	`//---------------------------------------------------------------------------------`
`215`		`-void ClientPrint(int playerIndex, const char* msg)`
	`211`	`+static void ClientPrint(int playerIndex, const char* msg)`
`216`	`212`	`{`
`217`	`213`	`if (!msg) return;`
`218`	`214`
`@@ -223,8 +219,7 @@ void ClientPrint(int playerIndex, const char* msg)`
`223`	`219`	`player_info_t playerInfo;`
`224`	`220`	`if (engineServer->GetPlayerInfo(i, &playerInfo))`
`225`	`221`	`{`
`226`		`- CBasePlayer* pPlayer = UTIL_PlayerByIndex(i);`
`227`		`- if (pPlayer)`
	`222`	`+ if (CBasePlayer* pPlayer = UTIL_PlayerByIndex(i))`
`228`	`223`	`{`
`229`	`224`	`UTIL_ClientPrint(pPlayer, HUD_PRINTTALK, msg);`
`230`	`225`	`}`
`@@ -252,7 +247,7 @@ void ClientPrint(int playerIndex, const char* msg)`
`252`	`247`	`// Vector is used to consolidate x, y, and channel parameters together.`
`253`	`248`	`// Vector is used to consolidate fadeinTime, fadeoutTime, and holdTime.`
`254`	`249`	`//---------------------------------------------------------------------------------`
`255`		`-void HudPrint`
	`250`	`+static void HudPrint`
`256`	`251`	`(`
`257`	`252`	`int playerIndex, const char* msg,`
`258`	`253`	`Vector posChannel, int effect, float fxTime,`
`@@ -282,7 +277,7 @@ void HudPrint`
`282`	`277`
`283`	`278`	`if (!playerIndex)`
`284`	`279`	`{`
`285`		`- UTIL_HudMessage(NULL, hudTextParams, msg);`
	`280`	`+ UTIL_HudMessage(nullptr, hudTextParams, msg);`
`286`	`281`	`return;`
`287`	`282`	`}`
`288`	`283`
`@@ -299,15 +294,15 @@ void HudPrint`
`299`	`294`	`//---------------------------------------------------------------------------------`
`300`	`295`	`// Purpose: Self-explanatory.`
`301`	`296`	`//---------------------------------------------------------------------------------`
`302`		`-int GetMaxPlayers()`
	`297`	`+static int GetMaxPlayers()`
`303`	`298`	`{`
`304`	`299`	`return MAX_PLAYERS;`
`305`	`300`	`}`
`306`	`301`
`307`	`302`	`//---------------------------------------------------------------------------------`
`308`	`303`	`// Purpose: Enable or disable displaying the score board for a player.`
`309`	`304`	`//---------------------------------------------------------------------------------`
`310`		`-void ShowScoreboard(int playerIndex, bool bEnable)`
	`305`	`+static void ShowScoreboard(int playerIndex, bool bEnable)`
`311`	`306`	`{`
`312`	`307`	`CBasePlayer__ShowViewPortPanel(playerIndex, "scores", bEnable);`
`313`	`308`	`}`