# HG changeset patch # User Adam Kaminski # Date 1623161219 14400 # Tue Jun 08 10:06:59 2021 -0400 # Node ID ba936eb077b92b7cb5a09959be4ba27fb45001ed # Parent dd3d6ccf3c1dfbb196af31dc8395c34bdec78b0b Renamed SCOREBOARD_RefreshHUD to HUD_Refresh. diff -r dd3d6ccf3c1d -r ba936eb077b9 src/bots.cpp --- a/src/bots.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/bots.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -664,7 +664,7 @@ } // Refresh the HUD since the number of players in the game is potentially changing. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); // [K6] If there are no more bots left, clear the bot nodes. if ( BOTS_CountBots( ) == 0 && ASTAR_IsInitialized( ) ) @@ -1974,7 +1974,7 @@ PostEvent( BOTEVENT_SPECTATING ); // Refresh the HUD since a new player is now here (this affects the number of players in the game). - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** diff -r dd3d6ccf3c1d -r ba936eb077b9 src/cl_main.cpp --- a/src/cl_main.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/cl_main.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -3750,7 +3750,7 @@ } // Refresh the HUD because this is potentially a new player. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -3947,7 +3947,7 @@ */ // Refresh the HUD, since this could affect the number of players left in an LMS game. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -4141,7 +4141,7 @@ // Finally, set the player's frag count, and refresh the HUD. player->fragcount = fragCount; - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -4149,7 +4149,7 @@ void ServerCommands::SetPlayerPoints::Execute() { player->lPointCount = pointCount; - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -4157,7 +4157,7 @@ void ServerCommands::SetPlayerWins::Execute() { player->ulWins = wins; - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -4165,7 +4165,7 @@ void ServerCommands::SetPlayerKillCount::Execute() { player->killcount = killCount; - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -4273,7 +4273,7 @@ pAmmo->MaxAmount = maxAmount; // Since an item displayed on the HUD may have been given, refresh the HUD. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -4531,7 +4531,7 @@ PLAYER_ResetPlayerData( player ); // Refresh the HUD because this affects the number of players in the game. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -4624,7 +4624,7 @@ g_bClientLagging = false; // [EP] Refresh the HUD, since this could affect the number of players left in a dead spectators game. - SCOREBOARD_RefreshHUD(); + HUD_Refresh( ); } //***************************************************************************** @@ -6154,7 +6154,7 @@ TEAM_SetScore( ulTeam, lScore, bAnnounce ); - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -7231,7 +7231,7 @@ players[ulPlayer].PendingWeapon = WP_NOCHANGE; // Since an item displayed on the HUD may have been given, refresh the HUD. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); // [BB] If this is not "our" player and this player didn't have a weapon before, we assume // that he was just spawned and didn't tell the server yet which weapon he selected. In this @@ -7303,7 +7303,7 @@ } // Since an item displayed on the HUD may have been taken away, refresh the HUD. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -7376,7 +7376,7 @@ } // Since an item displayed on the HUD may have been given, refresh the HUD. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** diff -r dd3d6ccf3c1d -r ba936eb077b9 src/duel.cpp --- a/src/duel.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/duel.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -260,7 +260,7 @@ GAME_ResetMap( ); GAMEMODE_RespawnAllPlayers( BOTEVENT_DUEL_FIGHT ); - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** diff -r dd3d6ccf3c1d -r ba936eb077b9 src/g_game.cpp --- a/src/g_game.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/g_game.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -1162,7 +1162,7 @@ CLIENTCOMMANDS_ChangeDisplayPlayer( ulPlayer ); // [BC] Also, refresh the HUD since the display player is changing. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } CCMD (spynext) diff -r dd3d6ccf3c1d -r ba936eb077b9 src/g_level.cpp --- a/src/g_level.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/g_level.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -1382,7 +1382,7 @@ level.maptime = 0; // Refresh the HUD. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); // Set number of duels to 0. DUEL_SetNumDuels( 0 ); diff -r dd3d6ccf3c1d -r ba936eb077b9 src/g_shared/a_flags.cpp --- a/src/g_shared/a_flags.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/g_shared/a_flags.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -183,7 +183,7 @@ SERVERCOMMANDS_TeamFlagReturned( TEAM_GetTeamFromItem( this ) ); } else - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); return ( false ); } @@ -213,7 +213,7 @@ ResetReturnTicks( ); // Also, refresh the HUD. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } pCopy = CreateCopy( pToucher ); @@ -552,7 +552,7 @@ // Also, refresh the HUD. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } return ( true ); @@ -960,7 +960,7 @@ this->ReturnFlag( NULL ); // Also, refresh the HUD. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); return ( true ); } diff -r dd3d6ccf3c1d -r ba936eb077b9 src/g_shared/a_pickups.cpp --- a/src/g_shared/a_pickups.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/g_shared/a_pickups.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -1258,7 +1258,7 @@ // [BC] Finally, refresh the HUD. if ( NETWORK_GetState( ) != NETSTATE_SERVER ) - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); // [Dusk] If it's a key, share it to others if sv_sharekeys is on. Note: // we store the key as having been found even if shared keys is off. This diff -r dd3d6ccf3c1d -r ba936eb077b9 src/lastmanstanding.cpp --- a/src/lastmanstanding.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/lastmanstanding.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -414,7 +414,7 @@ GAME_ResetMap( ); GAMEMODE_RespawnAllPlayers( BOTEVENT_LMS_FIGHT ); - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** diff -r dd3d6ccf3c1d -r ba936eb077b9 src/p_interaction.cpp --- a/src/p_interaction.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/p_interaction.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -2181,7 +2181,7 @@ } // Refresh the HUD since a score has changed. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -2224,7 +2224,7 @@ } // Refresh the HUD since a score has changed. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -2807,7 +2807,7 @@ pPlayer->lPointCount = ulPoints; // Refresh the HUD since a score has changed. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); if ( NETWORK_GetState( ) == NETSTATE_SERVER ) { @@ -2828,7 +2828,7 @@ pPlayer->ulWins = ulWins; // Refresh the HUD since a score has changed. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); if ( NETWORK_GetState( ) == NETSTATE_SERVER ) { diff -r dd3d6ccf3c1d -r ba936eb077b9 src/p_mobj.cpp --- a/src/p_mobj.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/p_mobj.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -5831,7 +5831,7 @@ D_UpdatePlayerColors( joinedgame ? MAXPLAYERS : p - players ); } - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); // [Spleen] Reset reconciliation buffer when player gets spawned UNLAGGED_ResetPlayer( p ); diff -r dd3d6ccf3c1d -r ba936eb077b9 src/p_user.cpp --- a/src/p_user.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/p_user.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -2100,7 +2100,7 @@ if (( bLeavingGame == false ) && ( NETWORK_GetState( ) == NETSTATE_SERVER )) SERVERCOMMANDS_TakeInventory( player - players, TEAM_GetItem( i ), 0 ); if ( NETWORK_GetState( ) != NETSTATE_SERVER ) - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); // Spawn a new flag. pTeamItem = Spawn( TEAM_GetItem( i ), x, y, z, NO_REPLACE ); @@ -2153,7 +2153,7 @@ if (( bLeavingGame == false ) && ( NETWORK_GetState( ) == NETSTATE_SERVER )) SERVERCOMMANDS_TakeInventory( player - players, pInventory->GetClass( ), 0 ); if ( NETWORK_GetState( ) != NETSTATE_SERVER ) - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); // Spawn a new flag. pTeamItem = Spawn( PClass::FindClass( "WhiteFlag" ), x, y, z, ALLOW_REPLACE ); @@ -2203,7 +2203,7 @@ if ( NETWORK_GetState( ) == NETSTATE_SERVER ) SERVERCOMMANDS_TakeInventory( player - players, PClass::FindClass( "PowerTerminatorArtifact" ), 0 ); else - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } } @@ -2219,7 +2219,7 @@ if ( NETWORK_GetState( ) == NETSTATE_SERVER ) SERVERCOMMANDS_TakeInventory( player - players, PClass::FindClass( "PowerPossessionArtifact" ), 0 ); else - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); // Tell the possession module that the artifact has been dropped. if ( possession || teampossession ) diff -r dd3d6ccf3c1d -r ba936eb077b9 src/possession.cpp --- a/src/possession.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/possession.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -484,7 +484,7 @@ GAME_SpawnPossessionArtifact( ); } - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -511,7 +511,7 @@ TEAM_SetScore( pPlayer->Team, TEAM_GetScore( pPlayer->Team ) + 1, true ); // Refresh the HUD since there's bound to be changes. - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); // Determine if the pointlimit has been reached. if (( teampossession ) && ( pPlayer->bOnTeam )) diff -r dd3d6ccf3c1d -r ba936eb077b9 src/scoreboard.cpp --- a/src/scoreboard.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/scoreboard.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -1149,7 +1149,7 @@ //***************************************************************************** // -void SCOREBOARD_RefreshHUD( void ) +void HUD_Refresh( void ) { if ( NETWORK_GetState( ) == NETSTATE_SERVER ) return; diff -r dd3d6ccf3c1d -r ba936eb077b9 src/scoreboard.h --- a/src/scoreboard.h Tue Jun 08 10:06:59 2021 -0400 +++ b/src/scoreboard.h Tue Jun 08 10:06:59 2021 -0400 @@ -106,7 +106,7 @@ ULONG SCOREBOARD_CalcRank( ULONG ulPlayerNum ); bool SCOREBOARD_IsTied( ULONG ulPlayerNum ); void SCOREBOARD_DrawFragMessage( player_t *pFraggedPlayer, bool bFraggedBy ); -void SCOREBOARD_RefreshHUD( void ); +void HUD_Refresh( void ); ULONG SCOREBOARD_GetNumPlayers( void ); ULONG SCOREBOARD_GetRank( void ); LONG SCOREBOARD_GetSpread( void ); diff -r dd3d6ccf3c1d -r ba936eb077b9 src/survival.cpp --- a/src/survival.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/survival.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -253,7 +253,7 @@ if ( (NETWORK_GetState( ) == NETSTATE_SINGLE) && sv_maxlives > 0 ) NETWORK_SetState( NETSTATE_SINGLE_MULTIPLAYER ); - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** diff -r dd3d6ccf3c1d -r ba936eb077b9 src/team.cpp --- a/src/team.cpp Tue Jun 08 10:06:59 2021 -0400 +++ b/src/team.cpp Tue Jun 08 10:06:59 2021 -0400 @@ -338,7 +338,7 @@ if ( NETWORK_GetState( ) == NETSTATE_SERVER ) SERVERCOMMANDS_TeamFlagReturned( ulTeamIdx ); else - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); } //***************************************************************************** @@ -615,7 +615,7 @@ if ( NETWORK_GetState( ) == NETSTATE_SERVER ) SERVERCOMMANDS_TakeInventory( ULONG( pPlayer - players ), TEAM_GetItem( ulTeamIdx ), 0 ); else - SCOREBOARD_RefreshHUD( ); + HUD_Refresh( ); // Respawn the skull. SkullOrigin = TEAM_GetItemOrigin( ulTeamIdx );