ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2025-02-18 10:01:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #24 from ENSL/pierow-fixes

Browse source 
turned off queued/autojump for jetpack
This commit is contained in:
pierow 2018-08-16 23:23:31 -04:00 committed by GitHub
commit 53655cc068
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5464,8 +5464,9 @@ void PM_Jump (void)
autojump = atoi(pmove->PM_Info_ValueForKey(pmove->physinfo, "jm2")); autojump = atoi(pmove->PM_Info_ValueForKey(pmove->physinfo, "jm2"));
queuedjump = atoi(pmove->PM_Info_ValueForKey(pmove->physinfo, "jm1")); queuedjump = atoi(pmove->PM_Info_ValueForKey(pmove->physinfo, "jm1"));
bool theHasJetpackUpgrade = GetHasUpgrade(pmove->iuser4, MASK_UPGRADE_7) && (pmove->iuser3 == AVH_USER3_MARINE_PLAYER);
if ((!autojump && !queuedjump) || pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3) if ((!autojump && !queuedjump) || pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3 || theHasJetpackUpgrade)
{ {
if (pmove->oldbuttons & IN_JUMP) if (pmove->oldbuttons & IN_JUMP)
return; // don't pogo stick return; // don't pogo stick