From 46a1d6897c220de97da5cbfff65f22021b6d4fff Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Mon, 7 Oct 2019 15:03:28 +0100
Subject: [PATCH] Address checkbox 1 and 2 of #235. * If using twinspin and
have melee ability too, go into melee landing when hitting the ground. * Only
have melee go directly forward if standing/idle, otherwise use drawangle.
---
src/p_user.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/p_user.c b/src/p_user.c
index e4792c1071..a594d4ae8f 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2249,7 +2249,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
else if (!player->skidtime)
player->pflags &= ~PF_GLIDING;
}
- else if (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2)
+ else if (player->charability2 == CA2_MELEE && ((player->panim == PA_ABILITY2) || (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)))
{
if (player->mo->state-states != S_PLAY_MELEE_LANDING)
{
@@ -4643,8 +4643,9 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
if (player->speed < FixedMul(player->maxdash, player->mo->scale))
#endif
{
- player->drawangle = player->mo->angle;
- P_InstaThrust(player->mo, player->mo->angle, FixedMul(player->maxdash, player->mo->scale));
+ if (player->panim == PA_IDLE)
+ player->drawangle = player->mo->angle;
+ P_InstaThrust(player->mo, player->drawangle, FixedMul(player->maxdash, player->mo->scale));
}
player->mo->momx += player->cmomx;
player->mo->momy += player->cmomy;
--
GitLab