From accd8bc5bd7f1e58f343b1945155de9e69728be2 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Thu, 29 Sep 2016 20:36:08 +0100 Subject: [PATCH] Minor fixes. Notably - no longer "deletes gravity" when hitting a slope mid-dash. --- src/p_mobj.c | 5 +++++ src/p_user.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 7092e7d81..dcc2ff18b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -3214,6 +3214,11 @@ static void P_PlayerZMovement(mobj_t *mo) P_ElementalFire(mo->player, true); } } + else if ((mo->player->powers[pw_shield] & SH_FORCE) == SH_FORCE) // Force shield's dodge dash. + { + mo->flags &= ~MF_NOGRAVITY; + mo->player->pflags &= ~PF_FULLSTASIS; + } } mo->player->pflags &= ~(PF_THOKKED|PF_CANCARRY|PF_SHIELDABILITY/*|PF_GLIDING*/); mo->player->jumping = 0; diff --git a/src/p_user.c b/src/p_user.c index 409ee9b45..a00c76b79 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -6945,9 +6945,7 @@ static void P_MovePlayer(player_t *player) dashangle += R_PointToAngle2(0, 0, player->cmd.forwardmove<cmd.sidemove<homing = 2; - if ((player->powers[pw_shield] & SH_NOSTACK) - SH_FORCE) - player->homing++; + player->homing = 2 + ((player->powers[pw_shield] & SH_NOSTACK) - SH_FORCE); S_StartSound(player->mo, sfx_s3k47); P_SetPlayerMobjState(player->mo, S_PLAY_SPIN); player->pflags |= PF_SPINNING|PF_THOKKED|PF_SHIELDABILITY;