valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-08 19:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 2fd04ffce6 into 0565403b15

Browse source
This commit is contained in:
FlaminSarge 2025-04-04 00:44:36 -07:00 committed by GitHub
commit 33aaefdc12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/shared/tf/tf_gamemovement.cpp
View file

@ -1116,12 +1116,6 @@ void CTFGameMovement::PreventBunnyJumping()
//-----------------------------------------------------------------------------
void CTFGameMovement::ToggleParachute()
{
if ( ( m_pTFPlayer->GetFlags() & FL_ONGROUND ) )
{
m_pTFPlayer->m_Shared.RemoveCond( TF_COND_PARACHUTE_DEPLOYED );
return;
}
if ( mv->m_nOldButtons & IN_JUMP )
return;
@ -1148,9 +1142,10 @@ void CTFGameMovement::ToggleParachute()
}
else
{
bool bOnGround = ( m_pTFPlayer->GetFlags() & FL_ONGROUND );
int iParachuteDisabled = 0;
CALL_ATTRIB_HOOK_INT_ON_OTHER( m_pTFPlayer, iParachuteDisabled, parachute_disabled );
if ( !iParachuteDisabled && ( tf_parachute_deploy_toggle_allowed.GetBool() || !m_pTFPlayer->m_Shared.InCond( TF_COND_PARACHUTE_DEPLOYED ) ) )
if ( !bOnGround && !iParachuteDisabled && ( tf_parachute_deploy_toggle_allowed.GetBool() || !m_pTFPlayer->m_Shared.InCond( TF_COND_PARACHUTE_DEPLOYED ) ) )
{
m_pTFPlayer->m_Shared.AddCond( TF_COND_PARACHUTE_ACTIVE );
m_pTFPlayer->m_Shared.AddCond( TF_COND_PARACHUTE_DEPLOYED );

6
src/game/shared/tf/tf_player_shared.cpp
View file

@ -3102,10 +3102,8 @@ void CTFPlayerShared::ConditionThink( void )
RemoveCond( TF_COND_KNOCKED_INTO_AIR );
RemoveCond( TF_COND_AIR_CURRENT );
if ( InCond( TF_COND_PARACHUTE_ACTIVE ) )
{
RemoveCond( TF_COND_PARACHUTE_ACTIVE );
}
RemoveCond( TF_COND_PARACHUTE_ACTIVE );
RemoveCond( TF_COND_PARACHUTE_DEPLOYED );
if ( InCond( TF_COND_ROCKETPACK ) )
{