lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't let players change their name more than five times per minute

Browse source 
(ported 17f75903b029bbf01217153dc98009d305137c8f and 11ddcfa9a1f2311ec67377b76ed1160ef14b7f60)
This commit is contained in:
James R 2020-08-31 20:08:22 -07:00
parent 90302330ed
commit b655fa496e
5 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_clisrv.c
View file

@ -3161,6 +3161,8 @@ static void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
// Reset the name // Reset the name
sprintf(player_names[playernum], "Player %d", playernum+1); sprintf(player_names[playernum], "Player %d", playernum+1);
player_name_changes[playernum] = 0;
if (IsPlayerAdmin(playernum)) if (IsPlayerAdmin(playernum))
{ {
RemoveAdminPlayer(playernum); // don't stay admin after you're gone RemoveAdminPlayer(playernum); // don't stay admin after you're gone
@ -3777,6 +3779,8 @@ void SV_ResetServer(void)
adminplayers[i] = -1; // Populate the entire adminplayers array with -1. adminplayers[i] = -1; // Populate the entire adminplayers array with -1.
} }
memset(player_name_changes, 0, sizeof player_name_changes);
mynode = 0; mynode = 0;
cl_packetmissed = false; cl_packetmissed = false;

4
src/d_clisrv.h
View file

@ -526,6 +526,10 @@ typedef enum
} kickreason_t; } kickreason_t;
/* the max number of name changes in some time period */
#define MAXNAMECHANGES (5)
#define NAMECHANGERATE (60*TICRATE)
extern boolean server; extern boolean server;
extern boolean serverrunning; extern boolean serverrunning;
#define client (!server) #define client (!server)

16
src/d_netcmd.c
View file

@ -1126,6 +1126,8 @@ static void SetPlayerName(INT32 playernum, char *newname)
if (netgame) if (netgame)
HU_AddChatText(va("\x82*%s renamed to %s", player_names[playernum], newname), false); HU_AddChatText(va("\x82*%s renamed to %s", player_names[playernum], newname), false);
player_name_changes[playernum]++;
strcpy(player_names[playernum], newname); strcpy(player_names[playernum], newname);
} }
} }
@ -1302,7 +1304,12 @@ static void SendNameAndColor(void)
snacpending++; snacpending++;
// Don't change name if muted // Don't change name if muted
if (cv_mute.value && !(server || IsPlayerAdmin(consoleplayer))) if (player_name_changes[consoleplayer] >= MAXNAMECHANGES)
{
CV_StealthSet(&cv_playername, player_names[consoleplayer]);
HU_AddChatText("\x85*You must wait to change your name again", false);
}
else if (cv_mute.value && !(server || IsPlayerAdmin(consoleplayer)))
CV_StealthSet(&cv_playername, player_names[consoleplayer]); CV_StealthSet(&cv_playername, player_names[consoleplayer]);
else // Cleanup name if changing it else // Cleanup name if changing it
CleanupPlayerName(consoleplayer, cv_playername.zstring); CleanupPlayerName(consoleplayer, cv_playername.zstring);
@ -1463,8 +1470,11 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
skin = READUINT8(*cp); skin = READUINT8(*cp);
// set name // set name
if (strcasecmp(player_names[playernum], name) != 0) if (player_name_changes[playernum] < MAXNAMECHANGES)
SetPlayerName(playernum, name); {
if (strcasecmp(player_names[playernum], name) != 0)
SetPlayerName(playernum, name);
}
// set color // set color
p->skincolor = color % numskincolors; p->skincolor = color % numskincolors;

7
src/g_game.c
View file

@ -452,6 +452,8 @@ player_t *seenplayer; // player we're aiming at right now
// so that it doesn't have to be updated depending on the value of MAXPLAYERS // so that it doesn't have to be updated depending on the value of MAXPLAYERS
char player_names[MAXPLAYERS][MAXPLAYERNAME+1]; char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
INT32 player_name_changes[MAXPLAYERS];
INT16 rw_maximums[NUM_WEAPONS] = INT16 rw_maximums[NUM_WEAPONS] =
{ {
800, // MAX_INFINITY 800, // MAX_INFINITY
@ -2345,6 +2347,11 @@ void G_Ticker(boolean run)
if (camtoggledelay2) if (camtoggledelay2)
camtoggledelay2--; camtoggledelay2--;
if (gametic % NAMECHANGERATE == 0)
{
memset(player_name_changes, 0, sizeof player_name_changes);
}
} }
} }

3
src/g_game.h
View file

@ -27,7 +27,8 @@ extern char customversionstring[32];
#ifdef SEENAMES #ifdef SEENAMES
extern player_t *seenplayer; extern player_t *seenplayer;
#endif #endif
extern char player_names[MAXPLAYERS][MAXPLAYERNAME+1]; extern char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
extern INT32 player_name_changes[MAXPLAYERS];
extern player_t players[MAXPLAYERS]; extern player_t players[MAXPLAYERS];
extern boolean playeringame[MAXPLAYERS]; extern boolean playeringame[MAXPLAYERS];