Skip to content

Commit 6b0b458

Browse files
FlaminSargemastercoms
authored andcommitted
Fix player not being able to deploy parachute after landing and becoming airborne without jump button
1 parent eb38df8 commit 6b0b458

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/game/shared/tf/tf_gamemovement.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,12 +1164,6 @@ void CTFGameMovement::PreventBunnyJumping()
11641164
//-----------------------------------------------------------------------------
11651165
void CTFGameMovement::ToggleParachute()
11661166
{
1167-
if ( ( m_pTFPlayer->GetFlags() & FL_ONGROUND ) )
1168-
{
1169-
m_pTFPlayer->m_Shared.RemoveCond( TF_COND_PARACHUTE_DEPLOYED );
1170-
return;
1171-
}
1172-
11731167
if ( mv->m_nOldButtons & IN_JUMP )
11741168
return;
11751169

src/game/shared/tf/tf_player_shared.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3095,9 +3095,16 @@ void CTFPlayerShared::ConditionThink( void )
30953095

30963096
VehicleThink();
30973097

3098-
if ( m_pOuter->GetFlags() & FL_ONGROUND && InCond( TF_COND_PARACHUTE_ACTIVE ) )
3098+
if ( m_pOuter->GetFlags() & FL_ONGROUND )
30993099
{
3100-
RemoveCond( TF_COND_PARACHUTE_ACTIVE );
3100+
if ( InCond( TF_COND_PARACHUTE_ACTIVE ) )
3101+
{
3102+
RemoveCond( TF_COND_PARACHUTE_ACTIVE );
3103+
}
3104+
if ( InCond( TF_COND_PARACHUTE_DEPLOYED ) )
3105+
{
3106+
RemoveCond( TF_COND_PARACHUTE_DEPLOYED );
3107+
}
31013108
}
31023109

31033110
// See if we should be pulsing our radius heal

0 commit comments

Comments
 (0)