Skip to content

[TF2] Fix TF training HUD lessons conflicting with stats panel #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Blixibon merged 1 commit into from
Sep 5, 2025
Merged

[TF2] Fix TF training HUD lessons conflicting with stats panel #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/game/client/mapbase/c_tf_lesson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "tf_hud_training.h"
#include "tf_hud_objectivestatus.h"
#include "tf_hud_notification_panel.h"
#include "tf_hud_statpanel.h"

//-----------------------------------------------------------------------------

Expand Down Expand Up @@ -636,6 +637,13 @@ void CTFObjectiveLesson::Start()

TFGameRules()->SetShowingTFObjectiveLesson( true );

// Hide the stat panel if it's active
CTFStatPanel *pStatPanel = GET_HUDELEMENT( CTFStatPanel );
if ( pStatPanel )
{
pStatPanel->Hide();
}

// HACKHACK: Can't put these in Init() due to base class usage
m_bNoIconTarget = true;
m_bAllowNodrawTarget = true;
Expand Down
6 changes: 6 additions & 0 deletions src/game/client/tf/tf_hud_statpanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,12 @@ void CTFStatPanel::ShowStatPanel( int iClass, int iTeam, int iCurStatValue, TFSt
return;
}

#ifdef MAPBASE
// Don't interfere with training HUD
if ( TFGameRules() && TFGameRules()->IsShowingTFObjectiveLesson() )
return;
#endif

ClassStats_t &classStats = GetClassStats( iClass );
vgui::Label *pLabel = dynamic_cast<Label *>( FindChildByName( "summaryLabel" ) );
if ( !pLabel )
Expand Down
Loading