stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 23:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'slider' into 'next'

Browse source 
Allow sliders passage through spin gaps (resolves #576)

Closes #576

See merge request STJr/SRB2!1520
This commit is contained in:
sphere 2021-05-31 08:31:42 -04:00
commit aec209ad2d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_user.c
View file

@ -12971,7 +12971,7 @@ boolean P_PlayerCanEnterSpinGaps(player_t *player)
else if (canEnter == 2)
return false;
return ((player->pflags & (PF_SPINNING|PF_GLIDING)) // players who are spinning or gliding
return ((player->pflags & (PF_SPINNING|PF_SLIDING|PF_GLIDING)) // players who are spinning, sliding, or gliding
|| (player->charability == CA_GLIDEANDCLIMB && player->mo->state-states == S_PLAY_GLIDE_LANDING) // players who are landing from a glide
|| JUMPCURLED(player)); // players who are jumpcurled, but only if they would normally jump that way
}
@ -12979,7 +12979,7 @@ boolean P_PlayerCanEnterSpinGaps(player_t *player)
// returns true if the player should use their skin's spinheight instead of their skin's height
boolean P_PlayerShouldUseSpinHeight(player_t *player)
{
return ((player->pflags & (PF_SPINNING|PF_GLIDING))
return ((player->pflags & (PF_SPINNING|PF_SLIDING|PF_GLIDING))
|| (player->mo->state == &states[player->mo->info->painstate])
|| (player->panim == PA_ROLL)
|| ((player->powers[pw_tailsfly] || (player->charability == CA_FLY && player->mo->state-states == S_PLAY_FLY_TIRED))