Skip to content

[TF2] Fix trigger_fall not working in TF2 #454

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

Merged
Blixibon merged 1 commit into from
Aug 4, 2025
Merged

[TF2] Fix trigger_fall not working in TF2 #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/game/server/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5533,6 +5533,10 @@ void CBasePlayer::Spawn( void )
}

m_weaponFiredTimer.Invalidate();

#ifdef MAPBASE
m_bInTriggerFall = false;
#endif
}

void CBasePlayer::Activate( void )
Expand Down
7 changes: 7 additions & 0 deletions src/game/server/tf/tf_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9222,6 +9222,13 @@ int CTFPlayer::OnTakeDamage( const CTakeDamageInfo &inputInfo )
{
bAllowDamage = true;
}
#ifdef MAPBASE
else if ( info.GetDamageType() & DMG_FALL && m_bInTriggerFall )
{
// trigger_fall should always kill
bAllowDamage = true;
}
#endif

if ( !TFGameRules()->ApplyOnDamageModifyRules( info, this, bAllowDamage ) )
{
Expand Down
8 changes: 8 additions & 0 deletions src/game/shared/tf/tf_gamerules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13333,6 +13333,14 @@ float CTFGameRules::FlPlayerFallDamage( CBasePlayer *pPlayer )
if ( !pTFPlayer )
return 0;

#ifdef MAPBASE
// trigger_fall overrides all fall damage conditions
if ( pTFPlayer->m_bInTriggerFall )
{
return pPlayer->GetMaxHealth();
}
#endif

// Karts don't take fall damage
if ( pTFPlayer->m_Shared.InCond( TF_COND_HALLOWEEN_KART ) )
{
Expand Down