Skip to content

Commit 6c74b24

Browse files
committed
gameplay: prevent phlog taunt cancel
ref: ValveSoftware/Source-1-Games#4650
1 parent 380e08d commit 6c74b24

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

src/game/server/tf/tf_player.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17107,6 +17107,7 @@ void CTFPlayer::Taunt( taunts_t iTauntIndex, int iTauntConcept )
1710717107
m_Shared.ActivateRageBuff( this, iBuffType );
1710817108

1710917109
// Pyro needs high defense while he's taunting
17110+
m_bAllowMoveDuringTaunt = true; // Don't allow the taunt to be cancelled
1711017111
//m_Shared.AddCond( TF_COND_DEFENSEBUFF_HIGH, 3.0f );
1711117112
m_Shared.AddCond( TF_COND_INVULNERABLE_USER_BUFF, 2.60f );
1711217113
m_Shared.AddCond( TF_COND_MEGAHEAL, 2.60f );

src/game/shared/tf/tf_player_shared.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2710,6 +2710,7 @@ void CTFPlayerShared::ConditionGameRulesThink( void )
27102710
if ( m_pOuter->IsAllowedToRemoveTaunt() && gpGlobals->curtime > m_pOuter->GetTauntRemoveTime() )
27112711
{
27122712
RemoveCond( TF_COND_TAUNTING );
2713+
m_pOuter->m_bAllowMoveDuringTaunt = false; // Make sure we clear out this flag
27132714
}
27142715
}
27152716

0 commit comments

Comments
 (0)