Skip to content

[TF2] Add support for Robot models in 3D playerhud while disguised in MvM #1977

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
rabscootle wants to merge 1 commit into
base: master
Choose a base branch
from
+59 −21
Open

[TF2] Add support for Robot models in 3D playerhud while disguised in MvM #1977

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
42 changes: 38 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 @@ -178,6 +178,15 @@ void CTFHudPlayerClass::ApplySchemeSettings( IScheme *pScheme )
BaseClass::ApplySchemeSettings( pScheme );
}

static bool IsMvMRobotDisguise( C_TFPlayer *pPlayer )
{
return pPlayer &&
TFGameRules() && TFGameRules()->IsMannVsMachineMode() &&
pPlayer->GetTeamNumber() == TF_TEAM_PVE_DEFENDERS &&
pPlayer->m_Shared.InCond( TF_COND_DISGUISED ) &&
pPlayer->m_Shared.GetDisguiseTeam() != pPlayer->GetTeamNumber();
}

//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
Expand All @@ -191,6 +200,18 @@ void CTFHudPlayerClass::OnThink()
if ( !pPlayer )
return;

// Hold the playerhud update for a brief moment so that the weapon can properly update before potentially changing classes
// Without a brief stall, past weapon will briefly persist with new disguise
CTFWeaponBase *pDisguiseWeapon = pPlayer->m_Shared.GetDisguiseWeapon();
bool bDisguiseIdentityChanged = m_nDisguiseClass != pPlayer->m_Shared.GetDisguiseClass() || m_nDisguiseTeam != pPlayer->m_Shared.GetDisguiseTeam();
bool bWaitingForDisguiseWeapon = pPlayer->m_Shared.InCond( TF_COND_DISGUISED ) &&
( !pDisguiseWeapon || ( bDisguiseIdentityChanged && m_hDisguiseWeapon.Get() == pDisguiseWeapon ) );
if ( bWaitingForDisguiseWeapon )
{
m_flNextThink = gpGlobals->curtime + 0.05f;
return;
}

bool bTeamChange = false;
// set our background colors
if ( m_nTeam != pPlayer->GetTeamNumber() )
Expand Down Expand Up @@ -449,14 +470,27 @@ void CTFHudPlayerClass::UpdateModelPanel()
CEconItemView *pWeapon = NULL;

bool bDisguised = pPlayer->m_Shared.InCond( TF_COND_DISGUISED );
bool bRobotDisguise = IsMvMRobotDisguise( pPlayer ); // Are we disguised as a robot?
CTFWeaponBase *pDisguiseWeapon = pPlayer->m_Shared.GetDisguiseWeapon();
bool bDisguiseIdentityChanged = m_nDisguiseClass != pPlayer->m_Shared.GetDisguiseClass() || m_nDisguiseTeam != pPlayer->m_Shared.GetDisguiseTeam();

// Hold the playerhud update for a brief moment so that the weapon can properly update before potentially changing classes
// Without a brief stall, past weapon will briefly persist with new disguise
if ( bDisguised &&
( !pDisguiseWeapon || ( bDisguiseIdentityChanged && m_hDisguiseWeapon.Get() == pDisguiseWeapon ) ) )
{
m_flNextThink = gpGlobals->curtime + 0.05f;
return;
}

if ( bDisguised )
{
nClass = pPlayer->m_Shared.GetDisguiseClass();
nTeam = pPlayer->m_Shared.GetDisguiseTeam();

if ( pPlayer->m_Shared.GetDisguiseWeapon() )
if ( pDisguiseWeapon )
{
CAttributeContainer *pCont = pPlayer->m_Shared.GetDisguiseWeapon()->GetAttributeContainer();
CAttributeContainer *pCont = pDisguiseWeapon->GetAttributeContainer();
pWeapon = pCont ? pCont->GetItem() : NULL;
if ( pWeapon )
{
Expand All @@ -477,7 +511,7 @@ void CTFHudPlayerClass::UpdateModelPanel()
}

m_pPlayerModelPanel->ClearCarriedItems();
m_pPlayerModelPanel->SetToPlayerClass( nClass );
m_pPlayerModelPanel->SetToPlayerClass( nClass, false, bRobotDisguise ? g_szBotModels[nClass] : NULL, bRobotDisguise );
m_pPlayerModelPanel->SetTeam( nTeam );

if ( pWeapon )
Expand Down Expand Up @@ -509,7 +543,7 @@ void CTFHudPlayerClass::UpdateModelPanel()
}
}

m_pPlayerModelPanel->HoldItemInSlot( nItemSlot );
m_pPlayerModelPanel->HoldItemInSlot( nItemSlot, bRobotDisguise );
}
}

Expand Down
28 changes: 16 additions & 12 deletions src/game/client/tf/vgui/tf_playermodelpanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ void CTFPlayerModelPanel::ApplySettings( KeyValues *inResourceData )
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CTFPlayerModelPanel::SetToPlayerClass( int iClass, bool bForceRefresh /*= false*/, const char *pszPlayerModelOverride /*= NULL*/ )
void CTFPlayerModelPanel::SetToPlayerClass( int iClass, bool bForceRefresh /*= false*/, const char *pszPlayerModelOverride /*= NULL*/, bool bOverrideUsesClassAnimations /*= false*/ )
{
if ( !m_strPlayerModelOverride.IsEqual_CaseInsensitive( pszPlayerModelOverride ) )
{
Expand All @@ -219,6 +219,10 @@ void CTFPlayerModelPanel::SetToPlayerClass( int iClass, bool bForceRefresh /*= f
if ( !m_strPlayerModelOverride.IsEmpty() )
{
SetMDL( m_strPlayerModelOverride.Get() );
if ( bOverrideUsesClassAnimations )
{
HoldFirstValidItem( true );
}
}
else
{
Expand Down Expand Up @@ -255,7 +259,7 @@ void CTFPlayerModelPanel::SetToPlayerClass( int iClass, bool bForceRefresh /*= f
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CTFPlayerModelPanel::HoldFirstValidItem( void )
void CTFPlayerModelPanel::HoldFirstValidItem( bool bPreserveModelOverride /*= false*/ )
{
RemoveAdditionalModels();

Expand Down Expand Up @@ -283,7 +287,7 @@ void CTFPlayerModelPanel::HoldFirstValidItem( void )

if ( iDesiredSlot != -1 )
{
UpdateHeldItem( iDesiredSlot );
UpdateHeldItem( iDesiredSlot, bPreserveModelOverride );
return;
}

Expand All @@ -297,19 +301,19 @@ void CTFPlayerModelPanel::HoldFirstValidItem( void )

if ( pItem && pItem->IsValid() )
{
SwitchHeldItemTo( pItem );
SwitchHeldItemTo( pItem, bPreserveModelOverride );
}
}

//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
bool CTFPlayerModelPanel::HoldItemInSlot( int iSlot )
bool CTFPlayerModelPanel::HoldItemInSlot( int iSlot, bool bPreserveModelOverride /*= false*/ )
{
if ( m_iCurrentClassIndex == TF_CLASS_UNDEFINED )
return false;

return UpdateHeldItem( iSlot );
return UpdateHeldItem( iSlot, bPreserveModelOverride );
}

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -351,7 +355,7 @@ bool CTFPlayerModelPanel::HoldItem( int iItemNumber )
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
bool CTFPlayerModelPanel::UpdateHeldItem( int iDesiredSlot )
bool CTFPlayerModelPanel::UpdateHeldItem( int iDesiredSlot, bool bPreserveModelOverride /*= false*/ )
{
m_pHeldItem = NULL;

Expand All @@ -363,20 +367,20 @@ bool CTFPlayerModelPanel::UpdateHeldItem( int iDesiredSlot )
// Also ignore requests to equip non-wearables that are never actively equipped
if ( bIsTauntItem || ( !pItem->GetStaticData()->IsAWearable() && pItem->GetAnimationSlot() != -2 ) )
{
SwitchHeldItemTo( pItem );
SwitchHeldItemTo( pItem, bPreserveModelOverride );
return true;
}
}

// If we were trying to switch to a new item, and it's not valid, stick to our current
if ( iDesiredSlot != m_iCurrentSlotIndex )
{
UpdateHeldItem( m_iCurrentSlotIndex );
UpdateHeldItem( m_iCurrentSlotIndex, bPreserveModelOverride );
return false;
}

// We were trying to stay on the current weapon, and it's not valid. Find anything.
HoldFirstValidItem();
HoldFirstValidItem( bPreserveModelOverride );
return false;
}

Expand Down Expand Up @@ -514,7 +518,7 @@ void CTFPlayerModelPanel::FireEvent( const char *pszEventName, const char *pszEv
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CTFPlayerModelPanel::SwitchHeldItemTo( CEconItemView *pItem )
void CTFPlayerModelPanel::SwitchHeldItemTo( CEconItemView *pItem, bool bPreserveModelOverride /*= false*/ )
{
m_nBody = 0;

Expand All @@ -532,7 +536,7 @@ void CTFPlayerModelPanel::SwitchHeldItemTo( CEconItemView *pItem )
}
else
{
SetToPlayerClass( m_iCurrentClassIndex );
SetToPlayerClass( m_iCurrentClassIndex, false, bPreserveModelOverride ? m_strPlayerModelOverride.Get() : NULL, bPreserveModelOverride );
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/game/client/tf/vgui/tf_playermodelpanel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ class CTFPlayerModelPanel : public CBaseModelPanel, public IChoreoEventCallback,

void ApplySettings( KeyValues *inResourceData );

void SetToPlayerClass( int iClass, bool bForceRefresh = false, const char *pszPlayerModelOverride = NULL );
bool HoldItemInSlot( int iSlot );
void SetToPlayerClass( int iClass, bool bForceRefresh = false, const char *pszPlayerModelOverride = NULL, bool bOverrideUsesClassAnimations = false );
bool HoldItemInSlot( int iSlot, bool bPreserveModelOverride = false );
bool HoldItem( int iItemNumber );
void SwitchHeldItemTo( CEconItemView *pItem );
void SwitchHeldItemTo( CEconItemView *pItem, bool bPreserveModelOverride = false );
void EquipRequiredLoadoutSlot( int iRequiredLoadoutSlot );
CEconItemView *GetHeldItem() { return m_pHeldItem; }

Expand Down Expand Up @@ -126,10 +126,10 @@ class CTFPlayerModelPanel : public CBaseModelPanel, public IChoreoEventCallback,
void InitPhonemeMappings( void );
void SetupMappings( char const *pchFileRoot );

void HoldFirstValidItem( void );
void HoldFirstValidItem( bool bPreserveModelOverride = false );
void EquipAllWearables( CEconItemView *pHeldItem );
void EquipItem( CEconItemView *pItem );
bool UpdateHeldItem( int iDesiredSlot );
bool UpdateHeldItem( int iDesiredSlot, bool bPreserveModelOverride = false );
void UpdateWeaponBodygroups( bool bModifyDeployedOnlyBodygroups );
void UpdateHiddenBodyGroups( CEconItemView* pItem );
CEconItemView *GetItemInSlot( int iSlot );
Expand Down