Update Traitors challenge: Added a new convar to insert player slot index before player name. This will help to specify players.

Author: ywgATustcbbs

reactivedrop/content/traitors_challenge/resource/challenges/traitors.txt

@@ -4,6 +4,8 @@
 	"allowed_mode" "coop"
 	"convars" {
 		"rd_player_bots_allowed" "0"
+		"cl_add_index_to_name" "1"
+		"rd_draw_restricted_rectangles_coop" "1"
 
 		"rd_auto_fast_restart" "1"
 		"rd_ready_mark_override" "1"

reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors.nut

@@ -182,7 +182,6 @@ function DebugKillAliens(interval = 1) {
 			hEntitiy.TakeDamage(99, DAMAGE_TYPE.DMG_FALL, null);
 		}
 	}
-
 }
 
 function DropWeapon() {
@@ -308,7 +307,6 @@ function DropWeapon() {
 			}
 		}
 	}
-
 }
 
 function FixT75(interval = 1) {
@@ -319,7 +317,6 @@ function FixT75(interval = 1) {
 	while (hT75 = Entities.FindByClassname(hT75, "asw_t75")) {
 		hT75.__KeyValueFromInt("solid", 0);
 	}
-
 }
 
 function RefreshSkillMenu(interval = 1) {
@@ -949,15 +946,6 @@ function DisplayGameInstructions() {
 }
 
 function InitializeMarineList() {
-	local i = 1;
-	local hPlayer = null;
-	while ((hPlayer = Entities.FindByClassname(hPlayer, "player")) != null) {
-		NetProps.SetPropString(hPlayer, "m_szNetname", i.tostring() +
-			"-" + hPlayer.GetPlayerName());
-		i++;
-	}
-
-
 	// 遍历士兵，同时移除机器人（防止有人在进入游戏瞬间掉线。这个概率很低，但需要排除）
 	local hMarine = null;
 	while ((hMarine = Entities.FindByClassname(hMarine, "asw_marine")) != null) {

src/game/client/c_playerresource.cpp

@@ -23,7 +23,7 @@ const float PLAYER_RESOURCE_THINK_INTERVAL = 0.2f;
 #define PLAYER_DEBUG_NAME "WWWWWWWWWWWWWWW"
 
 ConVar cl_names_debug( "cl_names_debug", "0", FCVAR_DEVELOPMENTONLY );
-
+ConVar cl_add_index_to_name("cl_add_index_to_name", "0", FCVAR_REPLICATED);
 
 void RecvProxy_ChangedTeam( const CRecvProxyData *pData, void *pStruct, void *pOut )
 {
@@ -143,6 +143,7 @@ void C_PlayerResource::OnDataChanged(DataUpdateType_t updateType)
 
 void C_PlayerResource::UpdatePlayerName( int slot )
 {
+	static char szNameTemp[MAX_PLAYERS + 1][MAX_PLAYER_NAME_LENGTH];
 	if ( slot < 1 || slot > MAX_PLAYERS )
 	{
 		Error( "UpdatePlayerName with bogus slot %d\n", slot );
@@ -155,11 +156,20 @@ void C_PlayerResource::UpdatePlayerName( int slot )
 	{
 		g_RDTextFiltering.FilterTextName( sPlayerInfo.name, g_RDTextFiltering.GetClientSteamID( slot ) );
 		pchPlayerName = sPlayerInfo.name;
+		V_snprintf(szNameTemp[slot], MAX_PLAYER_NAME_LENGTH - 1, "%d-%s", slot, pchPlayerName);
 	}
-
-	if ( !m_szName[slot] || Q_stricmp( m_szName[slot], pchPlayerName ) )
+	if (cl_add_index_to_name.GetBool()) {
+		if (!m_szName[slot] || Q_stricmp(m_szName[slot], szNameTemp[slot]))
+		{
+			m_szName[slot] = AllocPooledString(szNameTemp[slot]);
+		}
+	}
+	else
 	{
-		m_szName[slot] = AllocPooledString( pchPlayerName );
+		if (!m_szName[slot] || Q_stricmp(m_szName[slot], pchPlayerName))
+		{
+			m_szName[slot] = AllocPooledString(pchPlayerName);
+		}
 	}
 }