stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-09 11:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

* On Mystic's request, tweak to conditions to always show immediate feedback for everything except thokking.

Browse source 
* Melee attack hotfix.
This commit is contained in:
toasterbabe 2017-02-06 23:34:19 +00:00
parent 0e40299f3e
commit 006d25eaac
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_user.c
View file

@ -3857,6 +3857,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
player->mo->momy = player->cmomy = 0;
P_SetObjectMomZ(player->mo, player->mindash, false);
P_InstaThrust(player->mo, player->mo->angle, FixedMul(player->maxdash, player->mo->scale));
player->drawangle = player->mo->angle;
P_SetPlayerMobjState(player->mo, S_PLAY_MELEE);
player->pflags |= PF_USEDOWN;
S_StartSound(player->mo, sfx_s3k8b);
@ -9228,8 +9229,16 @@ void P_PlayerThink(player_t *player)
}
else if (cmd->forwardmove || cmd->sidemove) // only when you're pressing movement keys
{
#if 1
if (!((player->pflags & PF_SPINNING)
|| ((player->pflags & PF_THOKKED)
&& (player->charability == CA_THOK
|| player->charability == CA_HOMINGTHOK
|| player->charability == CA_JUMPTHOK)))
#else
if ((player->mo->movefactor < FRACUNIT) // hilarious absence of traction!
|| (player->powers[pw_pushing])
#endif
|| !(player->rmomx || player->rmomy)) // adjust to new angle
player->drawangle = player->mo->angle + R_PointToAngle2(0, 0, cmd->forwardmove<<FRACBITS, -cmd->sidemove<<FRACBITS);
else