valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-10 12:09:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge bd134f5e5f into 0565403b15

Browse source
This commit is contained in:
Lizard-Of-Oz 2025-04-02 23:17:34 -04:00 committed by GitHub
commit 2835a02752
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/tf/tf_teamstatus.cpp
View file

@ -298,7 +298,7 @@ bool CTFTeamStatusPlayerPanel::Update( void )
if ( iRespawnWait != m_iPrevRespawnWait )
{
m_iPrevRespawnWait = iRespawnWait;
if ( ( iRespawnWait < 0 ) || !bSameTeamAsLocalPlayer )
if ( ( iRespawnWait < 0 ) || !bSameTeamAsLocalPlayer || ( iRespawnWait >= 1000.0 ) )
{
SetDialogVariable( "respawntime", "" );
}

2
src/game/client/tf/vgui/tf_playerpanel.cpp
View file

@ -231,7 +231,7 @@ bool CTFPlayerPanel::Update( void )
if ( iRespawnWait != m_iPrevRespawnWait )
{
m_iPrevRespawnWait = iRespawnWait;
if ( iRespawnWait < 0 )
if ( iRespawnWait < 0 || iRespawnWait >= 1000.0 )
{
SetDialogVariable( "respawntime", "" );
}

4
src/game/client/tf/vgui/tf_spectatorgui.cpp
View file

@ -406,6 +406,10 @@ void CTFSpectatorGUI::UpdateReinforcements( void )
{
g_pVGuiLocalize->ConstructString_safe( wLabel, g_pVGuiLocalize->Find("#game_respawntime_in_sec" ), 0 );
}
else if ( iRespawnWait >= 1000.0 )
{
g_pVGuiLocalize->ConstructString_safe( wLabel, g_pVGuiLocalize->Find("#game_respawntime_disabled" ), 0 );
}
else
{
char szSecs[6];