Merge pull request #248 from ScriptedSnark/master

Client: fix GetThisPlayerInfo crash
tmp64 · Sep 29, 2024 · 98d50f3 · 98d50f3
2 parents 66d5785 + 7d41851
commit 98d50f3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/game/client/hud/chat.cpp b/src/game/client/hud/chat.cpp
@@ -1279,7 +1279,7 @@ void CHudChat::ChatPrintf(int iPlayerIndex, const char *fmt, ...)
 	}
 
 	// If a player is muted for voice, also mute them for text because jerks gonna jerk.
-	if (cl_mute_all_comms.GetBool() && iPlayerIndex != 0 && iPlayerIndex != GetThisPlayerInfo()->GetIndex())
+	if (GetThisPlayerInfo() && cl_mute_all_comms.GetBool() && iPlayerIndex != 0 && iPlayerIndex != GetThisPlayerInfo()->GetIndex())
 	{
 		if (GetClientVoiceMgr() && GetClientVoiceMgr()->IsPlayerBlocked(iPlayerIndex))
 			return;

diff --git a/src/game/client/hud/death_notice_panel.cpp b/src/game/client/hud/death_notice_panel.cpp
@@ -82,6 +82,12 @@ void CHudDeathNoticePanel::Think()
 
 void CHudDeathNoticePanel::AddItem(int killerId, int victimId, const char *killedwith)
 {
+	if (!GetThisPlayerInfo())
+	{
+		// Not yet connected
+		return;
+	}
+
 	Entry e;
 	CPlayerInfo *killer = GetPlayerInfoSafe(killerId);
 	CPlayerInfo *victim = GetPlayerInfoSafe(victimId);

diff --git a/src/game/client/vgui/score_panel.cpp b/src/game/client/vgui/score_panel.cpp
@@ -209,6 +209,12 @@ void CScorePanel::UpdateOnPlayerInfo(int client)
 
 void CScorePanel::DeathMsg(int killer, int victim)
 {
+	if (!GetThisPlayerInfo())
+	{
+		// Not yet connected
+		return;
+	}
+
 	if (victim == GetThisPlayerInfo()->GetIndex())
 	{
 		// if we were the one killed, set the scoreboard to indicate killer