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

Refactor.

Browse source
This commit is contained in:
toasterbabe 2017-02-07 13:13:03 +00:00
parent 66d160be43
commit b2de969d52
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_user.c
View file

@ -9209,7 +9209,7 @@ void P_PlayerThink(player_t *player)
player->drawangle = player->mo->angle; player->drawangle = player->mo->angle;
else if (P_PlayerInPain(player)) else if (P_PlayerInPain(player))
; ;
else if (player->powers[pw_carry] && player->mo->tracer) else if (player->powers[pw_carry] && player->mo->tracer) // carry
{ {
switch (player->powers[pw_carry]) switch (player->powers[pw_carry])
{ {
@ -9227,16 +9227,18 @@ void P_PlayerThink(player_t *player)
break; break;
} }
} }
else if ((player->pflags & PF_SPINNING) && (player->rmomx || player->rmomy)) // spin force
player->drawangle = R_PointToAngle2(0, 0, player->rmomx, player->rmomy);
else if (cmd->forwardmove || cmd->sidemove) // only when you're pressing movement keys else if (cmd->forwardmove || cmd->sidemove) // only when you're pressing movement keys
{ {
#if 1 #if 1
if (!((player->pflags & PF_SPINNING) if (!((player->pflags & PF_JUMPED)
|| ((player->pflags & PF_JUMPED) && !(player->charflags & SF_NOJUMPSPIN))) && !(player->charflags & SF_NOJUMPSPIN))
#else #else
if ((player->mo->movefactor < FRACUNIT) // hilarious absence of traction! if ((player->mo->movefactor < FRACUNIT) // hilarious absence of traction!
|| (player->powers[pw_pushing]) || (player->powers[pw_pushing])
#endif #endif
|| !(player->rmomx || player->rmomy)) // adjust to new angle || !(player->rmomx || player->rmomy)) // prevent a flicker when just starting out
player->drawangle = player->mo->angle + R_PointToAngle2(0, 0, cmd->forwardmove<<FRACBITS, -cmd->sidemove<<FRACBITS); player->drawangle = player->mo->angle + R_PointToAngle2(0, 0, cmd->forwardmove<<FRACBITS, -cmd->sidemove<<FRACBITS);
else else
player->drawangle = R_PointToAngle2(0, 0, player->rmomx, player->rmomy); player->drawangle = R_PointToAngle2(0, 0, player->rmomx, player->rmomy);