Revise spinheight/gap entry conditions (again), let's keep things WAY simpler:

- PF_NOJUMPDAMAGE no longer affects height at all (you're welcome katsy).
- Characters with SF_NOJUMPSPIN will only use spinheight when panim is PA_ROLL. They cannot enter gaps when jumping with spinheight, unless also spinning or gliding.
- All other characters use spinheight when panim is PA_JUMP or PA_ROLL. They can enter gaps when jumping with spinheight.
This commit is contained in:
lachablock 2021-03-25 21:42:25 +11:00
parent 6ea9653681
commit 000e865f80
1 changed files with 1 additions and 3 deletions

View File

@ -12958,9 +12958,7 @@ boolean P_PlayerFullbright(player_t *player)
#define JUMPCURLED(player) ((player->pflags & PF_JUMPED)\
&& (!(player->charflags & SF_NOJUMPSPIN))\
&& (!(player->pflags & PF_NOJUMPDAMAGE)\
|| ((player->charflags & SF_NOJUMPDAMAGE)\
&& (player->panim == PA_JUMP || player->panim == PA_ROLL))))\
&& (player->panim == PA_JUMP || player->panim == PA_ROLL))\
// returns true if the player can enter a sector that they could not if standing at their skin's full height
boolean P_PlayerCanEnterSpinGaps(player_t *player)