incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix notify printing lterally everyone's stats

Browse source 
also add a toggle for server hosts to disable the message
This commit is contained in:
minenice55 2026-01-23 20:02:22 -05:00
parent 30815b240d
commit 543b454978
3 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_netcmd.c
View file

@ -1448,6 +1448,7 @@ void D_RegisterClientCommands(void)
// player restat
CV_RegisterVar(&cv_allowrestat);
CV_RegisterVar(&cv_notifyrestat);
COM_AddCommand("restat", Command_Restat);
COM_AddCommand("restat2", Command_Restat2);
COM_AddCommand("restat3", Command_Restat3);

36
src/g_game.c
View file

@ -495,6 +495,7 @@ consvar_t cv_deadzonestyle[MAXSPLITSCREENPLAYERS] = {
// allows players to use restat (server toggle)
consvar_t cv_allowrestat = CVAR_INIT ("allowrestat", "Yes", CV_NETVAR, CV_YesNo, NULL);
consvar_t cv_notifyrestat = CVAR_INIT ("notifyrestat", "Yes", CV_NETVAR, CV_YesNo, NULL);
// now automatically allocated in D_RegisterClientCommands
// so that it doesn't have to be updated depending on the value of MAXPLAYERS
@ -2742,6 +2743,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
UINT8 kartspeedrestat;
UINT8 kartweightrestat;
boolean randomrestat;
boolean notifyrestat = false;
boolean followerready;
INT32 followerskin;
@ -2923,20 +2925,38 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
kartweightrestat = P_RandomRange(1, 9);
}
// this is horrible 🥹
notifyrestat = (
(
(kartspeedrestat == 0 || kartweightrestat == 0) &&
(
players[player].kartspeed != skins[players[player].skin].kartspeed ||
players[player].kartweight != skins[players[player].skin].kartweight
)
) ||
(
(
randomrestat ||
kartspeedrestat != players[player].kartspeed ||
kartweightrestat != players[player].kartweight
) && (kartspeedrestat != 0 || kartweightrestat != 0)
)
) && cv_notifyrestat.value;
if (kartspeedrestat != 0 && kartweightrestat != 0)
{
kartspeed = kartspeedrestat;
kartweight = kartweightrestat;
if (playeringame[player])
if (playeringame[player] && notifyrestat)
{
if (player == consoleplayer)
if ((splitscreen && player == consoleplayer) || player != consoleplayer)
{
HU_AddChatText(va("You are now %d speed, %d weight.", kartspeed, kartweight), true);
HU_AddChatText(va("%s is now %d speed, %d weight.", player_names[player], kartspeed, kartweight), true);
}
else
{
HU_AddChatText(va("%s is now %d speed, %d weight.", player_names[player], kartspeed, kartweight), true);
HU_AddChatText(va("You are now %d speed, %d weight.", kartspeed, kartweight), true);
}
}
}
@ -2945,15 +2965,15 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
kartspeed = skins[players[player].skin].kartspeed;
kartweight = skins[players[player].skin].kartweight;
if (playeringame[player])
if (playeringame[player] && notifyrestat)
{
if (player == consoleplayer)
if ((splitscreen && player == consoleplayer) || player != consoleplayer)
{
HU_AddChatText(va("You are now using your skin's default stats."), true);
HU_AddChatText(va("%s is now using their skin's default stats.", player_names[player]), true);
}
else
{
HU_AddChatText(va("%s is now using their skin's default stats.", player_names[player]), true);
HU_AddChatText(va("You are now using your skin's default stats."), true);
}
}
}

2
src/g_game.h
View file

@ -96,7 +96,7 @@ extern consvar_t cv_resetspecialmusic;
extern consvar_t cv_resume;
extern consvar_t cv_allowrestat;
extern consvar_t cv_allowrestat, cv_notifyrestat;
void weaponPrefChange(void);
void weaponPrefChange2(void);