Commit: 47d69cebabc15bdb02752f3691132b97cbb2bf9b - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

Commit MetaInfo

• Revision: 47d69cebabc15bdb02752f3691132b97cbb2bf9b (tree)
• Time: 2022-02-04 23:52:21
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

SERVER_KickPlayer now uses FString instead of C-style char arrays.

Change Summary

• modified: src/sv_main.cpp

Incremental Difference

diff -r 961f23b6edf1 -r 47d69cebabc1 src/sv_main.cpp
--- a/src/sv_main.cpp	Fri Feb 04 09:54:03 2022 -0500
+++ b/src/sv_main.cpp	Fri Feb 04 09:52:21 2022 -0500
@@ -3758,23 +3758,23 @@
 //
 void SERVER_KickPlayer( ULONG ulPlayer, const char *pszReason )
 {
-	ULONG	ulIdx;
-	char	szKickString[512];
-	char	szName[64];
+	ULONG		ulIdx;
+	FString		kickString;
+	FString		playerName;
 
 	// Make sure the target is valid and applicable.
 	if (( ulPlayer >= MAXPLAYERS ) || ( !playeringame[ulPlayer] ))
 		return;
 
-	sprintf( szName, "%s", players[ulPlayer].userinfo.GetName() );
-	V_RemoveColorCodes( szName );
+	playerName = players[ulPlayer].userinfo.GetName();
+	V_RemoveColorCodes( playerName );
 
 	// Build the full kick string.
-	sprintf( szKickString, TEXTCOLOR_ORANGE "%s" TEXTCOLOR_ORANGE " was kicked from the server! Reason: %s\n", szName, pszReason );
-	Printf( "%s", szKickString );
+	kickString.Format( TEXTCOLOR_ORANGE "%s was kicked from the server! Reason: %s\n", playerName.GetChars(), pszReason );
+	Printf( "%s", kickString.GetChars() );
 
 	// Rebuild the string that will be displayed to clients. This time, color codes are allowed.
-	sprintf( szKickString, TEXTCOLOR_ORANGE "%s" TEXTCOLOR_ORANGE " was kicked from the server! Reason: %s\n", players[ulPlayer].userinfo.GetName(), pszReason );
+	kickString.Format( TEXTCOLOR_ORANGE "%s" TEXTCOLOR_ORANGE " was kicked from the server! Reason: %s\n", players[ulPlayer].userinfo.GetName(), pszReason );
 
 	// Send the message out to all clients.
 	for ( ulIdx = 0; ulIdx < MAXPLAYERS; ulIdx++ )
@@ -3782,7 +3782,7 @@
 		if ( SERVER_IsValidClient( ulIdx ) == false )
 			continue;
 
-		SERVER_PrintfPlayer( PRINT_HIGH, ulIdx, "%s", szKickString );
+		SERVER_PrintfPlayer( PRINT_HIGH, ulIdx, "%s", kickString.GetChars() );
 	}
 
 	// If we're kicking a bot, just remove him.