fortressforever/fortressforever-2013
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-2013.git synced 2024-11-25 13:51:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed getting out of water when holding jump.

Browse source
This commit is contained in:
hlstriker 2013-11-03 12:08:53 +00:00 committed by squeek
parent c4061fb5f7
commit bbeb6107be
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mp/src/game/shared/gamemovement.cpp
View file

@ -1407,7 +1407,8 @@ void CGameMovement::WaterMove( void )
}
// if we have the jump key down, move us up as well
if (mv->m_nButtons & IN_JUMP)
if (mv->m_nButtons & IN_JUMP
&& !player->m_flWaterJumpTime) // FF --> hlstriker: Make sure we aren't water jumping before setting velocity.
{
// FF --> Move at a standard speed
//wishvel[2] += mv->m_flClientMaxSpeed;
@ -2087,7 +2088,7 @@ void CGameMovement::FullWalkMove( )
if ( player->GetWaterLevel() >= WL_Waist )
{
if ( player->GetWaterLevel() == WL_Waist
&& mv->m_vecVelocity[2] > 0 ) // FF --> hlstriker: Make sure the player is actually moving upwards before trying to jump out of water.
&& (mv->m_vecVelocity[2] > -10 || (mv->m_nButtons & IN_JUMP)) ) // FF --> hlstriker: Make sure the player is actually moving upwards OR holding jump before trying to jump out of water.
{
CheckWaterJump();
}