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

clean up bouncy fof code

Browse source
This commit is contained in:
katsy 2021-04-16 04:49:33 -05:00
parent bcd3245b76
commit d35a1811d6
1 changed files with 7 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/p_user.c
View file

@ -2772,16 +2772,9 @@ static void P_CheckBouncySectors(player_t *player)
player->mo->momx = -FixedMul(player->mo->momx,bouncestrength); player->mo->momx = -FixedMul(player->mo->momx,bouncestrength);
player->mo->momy = -FixedMul(player->mo->momy,bouncestrength); player->mo->momy = -FixedMul(player->mo->momy,bouncestrength);
if (player->pflags & PF_SPINNING)
{
player->pflags &= ~PF_SPINNING;
player->pflags |= P_GetJumpFlags(player);
player->pflags |= PF_THOKKED;
}
} }
else else
{ {
fixed_t newmom;
pslope_t *slope = (abs(oldz - topheight) < abs(oldz + player->mo->height - bottomheight)) ? *rover->t_slope : *rover->b_slope; pslope_t *slope = (abs(oldz - topheight) < abs(oldz + player->mo->height - bottomheight)) ? *rover->t_slope : *rover->b_slope;
momentum.x = player->mo->momx; momentum.x = player->mo->momx;
@ -2791,53 +2784,28 @@ static void P_CheckBouncySectors(player_t *player)
if (slope) if (slope)
P_ReverseQuantizeMomentumToSlope(&momentum, slope); P_ReverseQuantizeMomentumToSlope(&momentum, slope);
newmom = momentum.z = -FixedMul(momentum.z,bouncestrength)/2; momentum.z = -FixedMul(momentum.z,bouncestrength)/2;
if (abs(newmom) < (bouncestrength*2)) if (abs(momentum.z) < (bouncestrength*2))
goto bouncydone; goto bouncydone;
if (!(rover->master->flags & ML_BOUNCY)) if (momentum.z > FixedMul(24*FRACUNIT, player->mo->scale)) //half of the default player height
{ momentum.z = FixedMul(24*FRACUNIT, player->mo->scale);
if (newmom > 0) else if (momentum.z < -FixedMul(24*FRACUNIT, player->mo->scale))
{ momentum.z = -FixedMul(24*FRACUNIT, player->mo->scale);
if (newmom < 8*FRACUNIT)
newmom = 8*FRACUNIT;
}
else if (newmom < 0)
{
if (newmom > -8*FRACUNIT)
newmom = -8*FRACUNIT;
}
}
if (newmom > P_GetPlayerHeight(player)/2)
newmom = P_GetPlayerHeight(player)/2;
else if (newmom < -P_GetPlayerHeight(player)/2)
newmom = -P_GetPlayerHeight(player)/2;
momentum.z = newmom*2;
if (slope) if (slope)
P_QuantizeMomentumToSlope(&momentum, slope); P_QuantizeMomentumToSlope(&momentum, slope);
player->mo->momx = momentum.x; player->mo->momx = momentum.x;
player->mo->momy = momentum.y; player->mo->momy = momentum.y;
player->mo->momz = momentum.z/2; player->mo->momz = momentum.z;
if (player->pflags & PF_SPINNING) if (player->pflags & PF_SPINNING)
{ {
player->pflags &= ~PF_SPINNING;
player->pflags |= P_GetJumpFlags(player);
player->pflags |= PF_THOKKED; player->pflags |= PF_THOKKED;
} }
} }
if ((player->pflags & PF_SPINNING) && player->speed < FixedMul(1<<FRACBITS, player->mo->scale) && player->mo->momz)
{
player->pflags &= ~PF_SPINNING;
player->pflags |= P_GetJumpFlags(player);
}
goto bouncydone; goto bouncydone;
} }
} }