celisej567/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/celisej567/source-sdk-2013.git synced 2026-09-23 20:09:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed trigger_fall not doing anything when landing in water

Browse Source
This commit is contained in:
Blixibon
2021-10-09 15:04:10 -05:00
parent 7702ce96d4
commit 495d534307
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sp/src/game/shared/gamemovement.cpp
View File

@@ -3907,13 +3907,11 @@ void CGameMovement::CheckFalling( void )
return;
#ifdef MAPBASE
#ifdef GAME_DLL // Let's hope we could work without transmitting to the client...
if ( player->m_bInTriggerFall )
{
// This lets the fall damage functions do their magic without having to change them.
// This value lets the existing fall damage functions ensure a fatal fall.
player->m_Local.m_flFallVelocity += (PLAYER_FATAL_FALL_SPEED + PLAYER_LAND_ON_FLOATING_OBJECT);
}
#endif
#endif
if ( !IsDead() && player->m_Local.m_flFallVelocity >= PLAYER_FALL_PUNCH_THRESHOLD )
@@ -3921,7 +3919,11 @@ void CGameMovement::CheckFalling( void )
bool bAlive = true;
float fvol = 0.5;
#ifdef MAPBASE
if ( player->GetWaterLevel() > 0 && !player->m_bInTriggerFall )
#else
if ( player->GetWaterLevel() > 0 )
#endif
{
// They landed in water.
}