Skip to content

[TF2] Fix the B.A.S.E. Jumpers parachute not using half of its animations #1518

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

[TF2] Fix the B.A.S.E. Jumpers parachute not using half of its animations #1518

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d48748
Fix Parachute animations
gidi30 Aug 30, 2025
5360b90
.
gidi30 Aug 30, 2025
91c3e42
Fixed it not compiling on the server
gidi30 Aug 31, 2025
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
63 changes: 39 additions & 24 deletions src/game/shared/tf/tf_weapon_parachute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,19 @@ CTFParachute::CTFParachute()
//-----------------------------------------------------------------------------
void CTFParachute::CreateBanner()
{
#ifdef CLIENT_DLL
if ( m_hBannerEntity )
return;

BaseClass::CreateBanner();

#ifdef CLIENT_DLL

if ( m_hBannerEntity )
{
m_iParachuteAnimState = EParachuteRetracted_Idle;
int sequence = m_hBannerEntity->SelectWeightedSequence( ACT_PARACHUTE_RETRACT_IDLE );
m_hBannerEntity->ResetSequence( sequence );
m_flParachuteToIdleTime = -1;
}
#endif // CLIENT_DLL
}
Expand Down Expand Up @@ -91,37 +96,47 @@ void CTFParachute::ParachuteAnimThink( void )
bInCondition = false;
}

// Track Anim State
if ( m_iParachuteAnimState == EParachuteDeployed_Idle && !bInCondition )
{
// retract
int sequence = m_hBannerEntity->SelectWeightedSequence( ACT_PARACHUTE_RETRACT );
m_hBannerEntity->ResetSequence( sequence );
m_flParachuteToIdleTime = m_hBannerEntity->SequenceDuration() + gpGlobals->curtime;
bool bIsDeployed = m_iParachuteAnimState == EParachuteDeployed || m_iParachuteAnimState == EParachuteDeployed_Idle;
int iAct = -1;

m_iParachuteAnimState = EParachuteRetracted;
}
else if ( m_iParachuteAnimState == EParachuteRetracted_Idle && bInCondition )
// Track Anim State
if ( m_flParachuteToIdleTime < gpGlobals->curtime && m_flParachuteToIdleTime != -1 )
{
// deploy
int sequence = m_hBannerEntity->SelectWeightedSequence( ACT_PARACHUTE_DEPLOY );
m_hBannerEntity->ResetSequence( sequence );
m_flParachuteToIdleTime = m_hBannerEntity->SequenceDuration() + gpGlobals->curtime;
m_iParachuteAnimState = EParachuteDeployed;
if ( m_iParachuteAnimState == EParachuteDeployed )
{
iAct = ACT_PARACHUTE_DEPLOY_IDLE;
m_iParachuteAnimState = EParachuteDeployed_Idle;
}
else
{
iAct = ACT_PARACHUTE_RETRACT_IDLE;
m_iParachuteAnimState = EParachuteRetracted_Idle;
}
m_flParachuteToIdleTime = -1;
}

// To Idle
if ( m_iParachuteAnimState == EParachuteRetracted && m_flParachuteToIdleTime < gpGlobals->curtime )
if ( bIsDeployed != bInCondition )
{
int sequence = m_hBannerEntity->SelectWeightedSequence( ACT_PARACHUTE_RETRACT_IDLE );
m_hBannerEntity->ResetSequence( sequence );
m_iParachuteAnimState = EParachuteRetracted_Idle;
if ( bInCondition )
{
iAct = ACT_PARACHUTE_DEPLOY;
m_iParachuteAnimState = EParachuteDeployed;
}
else
{
iAct = ACT_PARACHUTE_RETRACT;
m_iParachuteAnimState = EParachuteRetracted;
}
}
else if ( m_iParachuteAnimState == EParachuteDeployed && m_flParachuteToIdleTime < gpGlobals->curtime )

if ( iAct != -1 )
{
int sequence = m_hBannerEntity->SelectWeightedSequence( ACT_PARACHUTE_DEPLOY_IDLE );
int sequence = m_hBannerEntity->SelectWeightedSequence( iAct );
m_hBannerEntity->ResetSequence( sequence );
m_iParachuteAnimState = EParachuteDeployed_Idle;
if ( m_iParachuteAnimState == EParachuteDeployed || m_iParachuteAnimState == EParachuteRetracted )
{
m_flParachuteToIdleTime = m_hBannerEntity->SequenceDuration() + gpGlobals->curtime;
}
}
}

Expand Down