From 006d25eaac3bc426a714517af5605c8b9fd9c8ce Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Mon, 6 Feb 2017 23:34:19 +0000 Subject: [PATCH] * On Mystic's request, tweak to conditions to always show immediate feedback for everything except thokking. * Melee attack hotfix. --- src/p_user.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/p_user.c b/src/p_user.c index 1a87c92da..95f1f0482 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -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<sidemove<