Skip to content

[TF2] Fix HUD player model not immediately reflecting loadout changes #1995

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

Open
Tkain wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[TF2] Fix HUD player model not immediately reflecting loadout changes #1995

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
11 changes: 7 additions & 4 deletions src/game/client/tf/tf_hud_playerstatus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ CTFHudPlayerClass::CTFHudPlayerClass( Panel *parent, const char *name ) : Editab
m_nKillStreak = 0;

m_bUsePlayerModel = cl_hud_playerclass_use_playermodel.GetBool();
m_bModelPanelDirty = false;

ListenForGameEvent( "localplayer_changedisguise" );
ListenForGameEvent( "post_inventory_application" );
Expand Down Expand Up @@ -233,10 +234,9 @@ void CTFHudPlayerClass::OnThink()
bPlayerClassModeChange = true;
}


bool bForceEyeUpdate = false;
// set our class image
if ( m_nClass != pPlayer->GetPlayerClass()->GetClassIndex() || bTeamChange || bCloakChange || bLoadoutPositionChange || bPlayerClassModeChange ||
if ( m_bModelPanelDirty || m_nClass != pPlayer->GetPlayerClass()->GetClassIndex() || bTeamChange || bCloakChange || bLoadoutPositionChange || bPlayerClassModeChange ||
(
m_nClass == TF_CLASS_SPY &&
(
Expand Down Expand Up @@ -411,6 +411,8 @@ static void HudPlayerClassUsePlayerModelDialogCallback( bool bConfirmed, void *p
//-----------------------------------------------------------------------------
void CTFHudPlayerClass::UpdateModelPanel()
{
m_bModelPanelDirty = false;

if ( !m_bUsePlayerModel )
{
return;
Expand Down Expand Up @@ -547,12 +549,13 @@ void CTFHudPlayerClass::FireGameEvent( IGameEvent * event )
}
else if ( FStrEq( "post_inventory_application", pszEventName ) )
{
// Force a refresh. if this is for the local player
// Force a refresh if this is for the local player.
int iUserID = event->GetInt( "userid" );
C_TFPlayer* pPlayer = ToTFPlayer( C_TFPlayer::GetLocalPlayer() );
if ( pPlayer && pPlayer->GetUserID() == iUserID )
{
UpdateModelPanel();
// Prediction won't have reconciled our loadout changes yet - defer our refresh to the next time we think.
m_bModelPanelDirty = true;
}
}
else if ( FStrEq( "localplayer_pickup_weapon", pszEventName ) )
Expand Down
2 changes: 1 addition & 1 deletion src/game/client/tf/tf_hud_playerstatus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ class CTFHudPlayerClass : public vgui::EditablePanel, public CGameEventListener
int m_nLoadoutPosition;
int m_nKillStreak;


bool m_bUsePlayerModel;
bool m_bModelPanelDirty;
};

//-----------------------------------------------------------------------------
Expand Down