ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-26 14:30:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #18 from ENSL/pierow-fixes

Browse source 
revert unintentional changes to commented code
This commit is contained in:
pierow 2018-08-15 03:42:44 -04:00 committed by GitHub
commit e6ca5321c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/source/common/const.h
View file

@ -68,7 +68,7 @@
// edict->movetype values // edict->movetype values
#define MOVETYPE_NONE 0 // never moves #define MOVETYPE_NONE 0 // never moves
//#define MOVETYPE_ANGLENOCLIP 1 //#define MOVETYPE_ANGLENOCLIP 1
//#define MOVETYPE_JUMPHELD 2 //#define MOVETYPE_ANGLECLIP 2
#define MOVETYPE_WALK 3 // Player only - moving on the ground #define MOVETYPE_WALK 3 // Player only - moving on the ground
#define MOVETYPE_STEP 4 // gravity, special edge handling -- monsters use this #define MOVETYPE_STEP 4 // gravity, special edge handling -- monsters use this
#define MOVETYPE_FLY 5 // No gravity, but still collides with stuff #define MOVETYPE_FLY 5 // No gravity, but still collides with stuff

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

@ -5341,6 +5341,7 @@ void PM_Jump (void)
if (pmove->dead || GetHasUpgrade(pmove->iuser4, MASK_ENSNARED)) if (pmove->dead || GetHasUpgrade(pmove->iuser4, MASK_ENSNARED))
{ {
//pmove->oldbuttons |= IN_JUMP; // don't jump again until released
pmove->flags |= FL_JUMPHELD; pmove->flags |= FL_JUMPHELD;
return; return;
} }