ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-22 12:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix lerk sticking to ladders when on the ground

Browse source
This commit is contained in:
pierow 2021-02-23 10:01:04 -05:00
parent 8e167f5eb8
commit e54684cdde
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/source/pm_shared/pm_shared.cpp
View file

@ -6566,7 +6566,7 @@ void PM_PlayerMove ( qboolean server )
NS_UpdateWallsticking();
// Don't run ladder code if dead or on a train, or a lerk or a skulk
bool theIsFlyingAlien = (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3) && (pmove->onground == -1);
bool theIsLerk = (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3);
bool theIsSkulk = (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER1);
// if ( PM_GetIsBlinking() ) {
@ -6574,7 +6574,7 @@ void PM_PlayerMove ( qboolean server )
g_onladder[pmove->player_index] = 0;
}
else {
if ( !pmove->dead && !(pmove->flags & FL_ONTRAIN) && !gIsJetpacking[pmove->player_index] && !GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) && !theIsFlyingAlien && !theIsSkulk)
if ( !pmove->dead && !(pmove->flags & FL_ONTRAIN) && !gIsJetpacking[pmove->player_index] && !GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) && !theIsLerk && !theIsSkulk)
{
pLadder = PM_Ladder();
if ( pLadder )