From c52ee364f57052a0bdd463d181aaacd87834b48c Mon Sep 17 00:00:00 2001
From: lachwright <lachlanwright17@gmail.com>
Date: Mon, 21 Oct 2019 12:49:12 +0800
Subject: [PATCH] Only allow landing in the melee ability mid-twinspin if jump
or spin is held
---
src/p_user.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/p_user.c b/src/p_user.c
index 33f84e2db2..37061f87e2 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2260,7 +2260,8 @@ 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) || (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)))
+ else if (player->charability2 == CA2_MELEE
+ && ((player->panim == PA_ABILITY2) || (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY && player->cmd.buttons & (BT_JUMP|BT_USE))))
{
if (player->mo->state-states != S_PLAY_MELEE_LANDING)
{
--
GitLab