mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-01-18 07:22:28 +00:00
Merge branch 'sneakers-reduction' into 'master'
Reduce speed sneaker factor to 1.67x See merge request STJr/SRB2Internal!368
This commit is contained in:
commit
71f93e7071
1 changed files with 16 additions and 23 deletions
23
src/p_user.c
23
src/p_user.c
|
@ -5874,35 +5874,28 @@ static void P_3dMovement(player_t *player)
|
|||
else
|
||||
topspeed = normalspd;
|
||||
}
|
||||
else if (player->powers[pw_super] || player->powers[pw_sneakers])
|
||||
else
|
||||
{
|
||||
if (player->powers[pw_super] || player->powers[pw_sneakers])
|
||||
{
|
||||
topspeed = 5 * normalspd / 3; // 1.67x
|
||||
thrustfactor = player->thrustfactor*2;
|
||||
acceleration = player->accelstart/2 + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * player->acceleration/2;
|
||||
|
||||
if (player->powers[pw_tailsfly])
|
||||
topspeed = normalspd;
|
||||
else if (player->mo->eflags & (MFE_UNDERWATER|MFE_GOOWATER))
|
||||
{
|
||||
topspeed = normalspd;
|
||||
acceleration = 2*acceleration/3;
|
||||
}
|
||||
else
|
||||
topspeed = normalspd * 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
topspeed = normalspd;
|
||||
thrustfactor = player->thrustfactor;
|
||||
acceleration = player->accelstart + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * player->acceleration;
|
||||
}
|
||||
|
||||
if (player->powers[pw_tailsfly])
|
||||
topspeed = normalspd/2;
|
||||
topspeed >>= 1;
|
||||
else if (player->mo->eflags & (MFE_UNDERWATER|MFE_GOOWATER))
|
||||
{
|
||||
topspeed = normalspd/2;
|
||||
topspeed >>= 1;
|
||||
acceleration = 2*acceleration/3;
|
||||
}
|
||||
else
|
||||
topspeed = normalspd;
|
||||
}
|
||||
|
||||
if (spin) // Prevent gaining speed whilst rolling!
|
||||
|
|
Loading…
Reference in a new issue