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

reallowed strafe key leeway, increased leeway strength

Browse source
This commit is contained in:
lachwright 2019-09-23 00:21:28 +08:00
parent 203f9d8c1a
commit e9d211d2bc
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/p_user.c
View file

@ -8014,8 +8014,7 @@ static void P_MovePlayer(player_t *player)
fixed_t leeway; fixed_t leeway;
fixed_t glidespeed = player->normalspeed; // TODO: this should be actionspd, but I wanted to play around with making glide less of a flow-killer fixed_t glidespeed = player->normalspeed; // TODO: this should be actionspd, but I wanted to play around with making glide less of a flow-killer
fixed_t momx = mo->momx, momy = mo->momy; fixed_t momx = mo->momx, momy = mo->momy;
angle_t angle = mo->angle; angle_t angle, moveangle = R_PointToAngle2(0, 0, momx, momy);
angle_t moveangle = R_PointToAngle2(0, 0, momx, momy);
if (player->powers[pw_super]) if (player->powers[pw_super])
glidespeed *= 2; glidespeed *= 2;
@ -8032,7 +8031,8 @@ static void P_MovePlayer(player_t *player)
} }
// Strafing while gliding. // Strafing while gliding.
leeway = FixedAngle(cmd->sidemove*(FRACUNIT/2)); leeway = FixedAngle(cmd->sidemove*(FRACUNIT));
angle = mo->angle - leeway;
if (player->skidtime) // ground gliding if (player->skidtime) // ground gliding
{ {
@ -8042,22 +8042,23 @@ static void P_MovePlayer(player_t *player)
speed = FixedMul(speed - player->glidetime*FRACUNIT, player->mo->scale); speed = FixedMul(speed - player->glidetime*FRACUNIT, player->mo->scale);
if (speed < 0) if (speed < 0)
speed = 0; speed = 0;
P_InstaThrust(player->mo, moveangle - leeway, speed); P_InstaThrust(player->mo, moveangle, speed);
} }
else else
{ {
fixed_t speed, glidex, glidey = 0, scale = mo->scale; //fixed_t glidex, glidey = 0;
fixed_t accelfactor = 4*FRACUNIT - 3*FINECOSINE(abs(((angle >> ANGLETOFINESHIFT) & FINEMASK) - ((moveangle >> ANGLETOFINESHIFT) & FINEMASK))); // mamgic number BAD but this feels right fixed_t speed, scale = mo->scale;
fixed_t accelfactor = 4*FRACUNIT - 3*FINECOSINE(((angle-moveangle) >> ANGLETOFINESHIFT) & FINEMASK); // mamgic number BAD but this feels right
if (mo->eflags & MFE_UNDERWATER) if (mo->eflags & MFE_UNDERWATER)
speed = FixedMul((glidespeed>>1) + player->glidetime*750, scale); speed = FixedMul((glidespeed>>1) + player->glidetime*750, scale);
else else
speed = FixedMul(glidespeed + player->glidetime*1500, scale); speed = FixedMul(glidespeed + player->glidetime*1500, scale);
glidex = P_ReturnThrustX(mo, angle, speed); /*glidex = P_ReturnThrustX(mo, angle, speed);
if (!(twodlevel || (mo->flags2 & MF2_TWOD))) if (!(twodlevel || (mo->flags2 & MF2_TWOD)))
glidey = P_ReturnThrustY(mo, angle, speed); glidey = P_ReturnThrustY(mo, angle, speed);*/
P_Thrust(mo, angle, FixedMul(accelfactor, scale)); P_Thrust(mo, angle, FixedMul(accelfactor, scale));
if (P_AproxDistance(mo->momx, mo->momy) > speed) if (P_AproxDistance(mo->momx, mo->momy) > speed)
@ -11242,6 +11243,9 @@ void P_PlayerThink(player_t *player)
if (player->pflags & PF_GLIDING) if (player->pflags & PF_GLIDING)
{ {
if (player->speed < player->mo->scale)
diff = player->mo->angle - player->drawangle;
else
diff = (R_PointToAngle2(0, 0, player->rmomx, player->rmomy) - player->drawangle); diff = (R_PointToAngle2(0, 0, player->rmomx, player->rmomy) - player->drawangle);
factor = 4; factor = 4;
} }