lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sneakers-reduction' into 'master' 

Reduce speed sneaker factor to 1.67x

See merge request STJr/SRB2Internal!368
This commit is contained in:
MascaraSnake 2019-10-12 11:00:24 -04:00
parent 6fab3d28b2 b2529136e0
commit 71f93e7071
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/p_user.c
View File

@ -5874,35 +5874,28 @@ static void P_3dMovement(player_t *player)
else
topspeed = normalspd;
}
else if (player->powers[pw_super] || player->powers[pw_sneakers])
{
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
{
thrustfactor = player->thrustfactor;
acceleration = player->accelstart + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * player->acceleration;
if (player->powers[pw_tailsfly])
topspeed = normalspd/2;
else if (player->mo->eflags & (MFE_UNDERWATER|MFE_GOOWATER))
if (player->powers[pw_super] || player->powers[pw_sneakers])
{
topspeed = normalspd/2;
acceleration = 2*acceleration/3;
topspeed = 5 * normalspd / 3; // 1.67x
thrustfactor = player->thrustfactor*2;
acceleration = player->accelstart/2 + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * player->acceleration/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 >>= 1;
else if (player->mo->eflags & (MFE_UNDERWATER|MFE_GOOWATER))
{
topspeed >>= 1;
acceleration = 2*acceleration/3;
}
}
if (spin) // Prevent gaining speed whilst rolling!