Commit: cce7b44c33e748da6fcf9dd49df09e8722f0b73b - zandronum-macos (hg)

This is a fork of Zandronum for Mac Os (Silicon and Intel)

Commit MetaInfo

• Revision: cce7b44c33e748da6fcf9dd49df09e8722f0b73b (tree)
• Time: 2021-12-03 08:42:30
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Added a sanity check to ensure that a team's carrier is still a valid player.

Change Summary

• modified: src/team.cpp

Incremental Difference

diff -r bdd2490c09ae -r cce7b44c33e7 src/team.cpp
--- a/src/team.cpp	Wed Dec 01 18:38:26 2021 -0500
+++ b/src/team.cpp	Thu Dec 02 18:42:30 2021 -0500
@@ -1243,7 +1243,8 @@
 //
 player_t *TEAM_GetCarrier( ULONG ulTeamIdx )
 {
-	if ( TEAM_CheckIfValid( ulTeamIdx ))
+	// [AK] Also make sure that this team's carrier is still valid.
+	if (( TEAM_CheckIfValid( ulTeamIdx )) && ( PLAYER_IsValidPlayerWithMo( teams[ulTeamIdx].g_pCarrier - players )))
 		return ( teams[ulTeamIdx].g_pCarrier );
 
 	return ( NULL );