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

Merge branch 'analogfixes' into 'master'

Browse source 
Small analog mode fixes

See merge request STJr/SRB2Internal!604
This commit is contained in:
MascaraSnake 2019-12-06 15:32:10 -05:00
parent 201cdef381 cffc6a0e46
commit f4c89c2dac
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_user.c
View file

@ -6111,7 +6111,7 @@ static void P_3dMovement(player_t *player)
// (Why was it so complicated before? ~Red) // (Why was it so complicated before? ~Red)
controldirection = R_PointToAngle2(0, 0, cmd->forwardmove*FRACUNIT, -cmd->sidemove*FRACUNIT)+movepushangle; controldirection = R_PointToAngle2(0, 0, cmd->forwardmove*FRACUNIT, -cmd->sidemove*FRACUNIT)+movepushangle;
movepushforward = max(abs(cmd->sidemove), abs(cmd->forwardmove)) * (thrustfactor * acceleration); movepushforward = FixedHypot(cmd->sidemove, cmd->forwardmove) * (thrustfactor * acceleration);
// Allow a bit of movement while spinning // Allow a bit of movement while spinning
if ((player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_SPINNING) if ((player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_SPINNING)
@ -8247,7 +8247,7 @@ static void P_MovePlayer(player_t *player)
if (player->pflags & PF_GLIDING) if (player->pflags & PF_GLIDING)
{ {
mobj_t *mo = player->mo; // seriously why isn't this at the top of the function hngngngng mobj_t *mo = player->mo; // seriously why isn't this at the top of the function hngngngng
fixed_t leeway; fixed_t leeway = !P_AnalogMove(player) ? FixedAngle(cmd->sidemove*(FRACUNIT)) : 0;
fixed_t glidespeed = player->actionspd; fixed_t glidespeed = player->actionspd;
fixed_t momx = mo->momx - player->cmomx, momy = mo->momy - player->cmomy; fixed_t momx = mo->momx - player->cmomx, momy = mo->momy - player->cmomy;
angle_t angle, moveangle = R_PointToAngle2(0, 0, momx, momy); angle_t angle, moveangle = R_PointToAngle2(0, 0, momx, momy);
@ -8267,7 +8267,6 @@ static void P_MovePlayer(player_t *player)
} }
// Strafing while gliding. // Strafing while gliding.
leeway = FixedAngle(cmd->sidemove*(FRACUNIT));
angle = mo->angle - leeway; angle = mo->angle - leeway;
if (!player->skidtime) // TODO: make sure this works in 2D! if (!player->skidtime) // TODO: make sure this works in 2D!