Skip to content

[TF2] Allow TF_COND_INVULNERABLE_HIDE_UNLESS_DAMAGED to function outside MvM #1794

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
FlaminSarge wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[TF2] Allow TF_COND_INVULNERABLE_HIDE_UNLESS_DAMAGED to function outside MvM #1794

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: 6 additions & 2 deletions src/game/client/tf/c_tf_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8334,7 +8334,9 @@ bool C_TFPlayer::IsOverridingViewmodel( void )
pPlayer = assert_cast<C_TFPlayer*>(pLocalPlayer->GetObserverTarget());
}

if ( pPlayer->m_Shared.IsInvulnerable() )
bool bUseInvulnMaterial = ( pPlayer->m_Shared.IsInvulnerable() &&
( !pPlayer->m_Shared.InCond( TF_COND_INVULNERABLE_HIDE_UNLESS_DAMAGED ) || gpGlobals->curtime < pPlayer->GetLastDamageTimeMvMOnly() + 2.0f ) );
if ( bUseInvulnMaterial )
return true;

return BaseClass::IsOverridingViewmodel();
Expand Down Expand Up @@ -8369,7 +8371,9 @@ int C_TFPlayer::DrawOverriddenViewmodel( C_BaseViewModel *pViewmodel, int flags
pPlayer = assert_cast<C_TFPlayer*>(pLocalPlayer->GetObserverTarget());
}

if ( pPlayer->m_Shared.IsInvulnerable() )
bool bUseInvulnMaterial = ( pPlayer->m_Shared.IsInvulnerable() &&
( !pPlayer->m_Shared.InCond( TF_COND_INVULNERABLE_HIDE_UNLESS_DAMAGED ) || gpGlobals->curtime < pPlayer->GetLastDamageTimeMvMOnly() + 2.0f ) );
if ( bUseInvulnMaterial )
{
if ( flags & STUDIO_RENDER )
{
Expand Down
3 changes: 2 additions & 1 deletion src/game/server/tf/tf_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10632,9 +10632,10 @@ int CTFPlayer::OnTakeDamage_Alive( const CTakeDamageInfo &info )
}

m_flLastDamageTime = gpGlobals->curtime; // not networked
if ( TFGameRules()->IsMannVsMachineMode() )
if ( TFGameRules()->IsMannVsMachineMode() || m_Shared.InCond( TF_COND_INVULNERABLE_HIDE_UNLESS_DAMAGED ) )
{
// We only need damage time networked while in MvM
// also set it if victim has INVULNERABLE_HIDE_UNLESS_DAMAGED
m_flMvMLastDamageTime = gpGlobals->curtime;
}

Expand Down
2 changes: 1 addition & 1 deletion src/game/shared/tf/tf_item_wearable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ int CTFWearable::InternalDrawModel( int flags )
}

bool bUseInvulnMaterial = ( pOwner && pOwner->m_Shared.IsInvulnerable() &&
( !pOwner->m_Shared.InCond( TF_COND_INVULNERABLE_HIDE_UNLESS_DAMAGED ) || gpGlobals->curtime < pOwner->GetLastDamageTimeMvMOnly() + 2.0f ) );
( !pOwner->m_Shared.InCond( TF_COND_INVULNERABLE_HIDE_UNLESS_DAMAGED ) || gpGlobals->curtime < pOwner->GetLastDamageTimeMvMOnly() + 2.0f ) );

if ( bUseInvulnMaterial && (flags & STUDIO_RENDER) )
{
Expand Down