From 6f9b1cbedd32f332957980bc684b38d31ece2649 Mon Sep 17 00:00:00 2001 From: TheNotoriousFrogposter Date: Sun, 7 Dec 2025 10:48:07 +0800 Subject: [PATCH 1/2] Fix tf_allow_sliding_taunt --- src/game/server/tf/tf_player.cpp | 11 +++++++++-- src/game/shared/tf/tf_player_shared.cpp | 10 ---------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/game/server/tf/tf_player.cpp b/src/game/server/tf/tf_player.cpp index fa944e35611..6e8bca07501 100644 --- a/src/game/server/tf/tf_player.cpp +++ b/src/game/server/tf/tf_player.cpp @@ -203,6 +203,8 @@ ConVar tf_max_voice_speak_delay( "tf_max_voice_speak_delay", "1.5", FCVAR_DEVELO ConVar tf_allow_player_use( "tf_allow_player_use", "0", FCVAR_NOTIFY, "Allow players to execute +use while playing." ); +ConVar tf_allow_sliding_taunt( "tf_allow_sliding_taunt", "0", FCVAR_NONE, "1 - Allow player to slide for a bit after taunting" ); + ConVar tf_deploying_bomb_time( "tf_deploying_bomb_time", "1.90", FCVAR_CHEAT | FCVAR_DEVELOPMENTONLY, "Time to deploy bomb before the point of no return." ); ConVar tf_deploying_bomb_delay_time( "tf_deploying_bomb_delay_time", "0.0", FCVAR_CHEAT | FCVAR_DEVELOPMENTONLY, "Time to delay before deploying bomb." ); @@ -17740,7 +17742,9 @@ void CTFPlayer::OnTauntSucceeded( const char* pszSceneName, int iTauntIndex /*= m_Shared.m_iTauntIndex = iTauntIndex; m_Shared.m_iTauntConcept.Set( iTauntConcept ); m_flTauntStartTime = gpGlobals->curtime; - m_flTauntNextStartTime = m_flTauntStartTime + flDuration; + + if ( !tf_allow_sliding_taunt.GetBool() ) + m_flTauntNextStartTime = m_flTauntStartTime + flDuration; const itemid_t unTauntSourceItemID = m_TauntEconItemView.IsValid() ? m_TauntEconItemView.GetItemID() : INVALID_ITEM_ID; m_Shared.m_unTauntSourceItemID_Low = unTauntSourceItemID & 0xffffffff; @@ -17770,7 +17774,10 @@ void CTFPlayer::OnTauntSucceeded( const char* pszSceneName, int iTauntIndex /*= m_angTauntCamera = EyeAngles(); // Slam velocity to zero. - SetAbsVelocity( vec3_origin ); + if ( !tf_allow_sliding_taunt.GetBool() ) + { + SetAbsVelocity( vec3_origin ); + } // play custom set taunt particle if we have a full set equipped if ( IsPlayerClass( TF_CLASS_SPY ) ) diff --git a/src/game/shared/tf/tf_player_shared.cpp b/src/game/shared/tf/tf_player_shared.cpp index 65297449744..d8e0e9a8da2 100644 --- a/src/game/shared/tf/tf_player_shared.cpp +++ b/src/game/shared/tf/tf_player_shared.cpp @@ -157,8 +157,6 @@ ConVar tf_damage_events_track_for( "tf_damage_events_track_for", "30", FCVAR_DE extern ConVar tf_halloween_giant_health_scale; -ConVar tf_allow_sliding_taunt( "tf_allow_sliding_taunt", "0", FCVAR_NONE, "1 - Allow player to slide for a bit after taunting" ); - #endif // GAME_DLL @@ -13014,14 +13012,6 @@ bool CTFPlayer::CanMoveDuringTaunt() if ( m_Shared.InCond( TF_COND_TAUNTING ) || m_Shared.InCond( TF_COND_HALLOWEEN_THRILLER ) ) { -#ifdef GAME_DLL - if ( tf_allow_sliding_taunt.GetBool() ) - { - return true; - } -#endif // GAME_DLL - - if ( m_bAllowMoveDuringTaunt ) { return true; From 42b2cd3122f825cc5dd5b81c64d5ee23f5095fc6 Mon Sep 17 00:00:00 2001 From: TheNotoriousFrogposter Date: Wed, 10 Dec 2025 13:26:26 +0800 Subject: [PATCH 2/2] Update tf_player.cpp --- src/game/server/tf/tf_player.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/game/server/tf/tf_player.cpp b/src/game/server/tf/tf_player.cpp index 6e8bca07501..7ead33b22b1 100644 --- a/src/game/server/tf/tf_player.cpp +++ b/src/game/server/tf/tf_player.cpp @@ -17742,9 +17742,7 @@ void CTFPlayer::OnTauntSucceeded( const char* pszSceneName, int iTauntIndex /*= m_Shared.m_iTauntIndex = iTauntIndex; m_Shared.m_iTauntConcept.Set( iTauntConcept ); m_flTauntStartTime = gpGlobals->curtime; - - if ( !tf_allow_sliding_taunt.GetBool() ) - m_flTauntNextStartTime = m_flTauntStartTime + flDuration; + m_flTauntNextStartTime = m_flTauntStartTime + flDuration; const itemid_t unTauntSourceItemID = m_TauntEconItemView.IsValid() ? m_TauntEconItemView.GetItemID() : INVALID_ITEM_ID; m_Shared.m_unTauntSourceItemID_Low = unTauntSourceItemID & 0xffffffff;