From f844fb34606ee0b04156fb6aa8197097ee938691 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Sat, 10 Sep 2016 21:00:57 +0100
Subject: [PATCH] More strenous checking of ability for these animations in
preparation for something I wanna try...
---
src/p_mobj.c | 4 ++--
src/p_user.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 9fb0063d94..808ff63556 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -3169,7 +3169,7 @@ static void P_PlayerZMovement(mobj_t *mo)
{
if (mo->player->cmomx || mo->player->cmomy)
{
- if (mo->player->dashmode >= 3*TICRATE && mo->player->panim != PA_PEEL)
+ if (mo->player->charability == CA_DASHMODE && mo->player->dashmode >= 3*TICRATE && mo->player->panim != PA_PEEL)
P_SetPlayerMobjState(mo, S_PLAY_PEEL);
else if (mo->player->speed >= FixedMul(mo->player->runspeed, mo->scale) && mo->player->panim != PA_RUN)
P_SetPlayerMobjState(mo, S_PLAY_RUN);
@@ -3180,7 +3180,7 @@ static void P_PlayerZMovement(mobj_t *mo)
}
else
{
- if (mo->player->dashmode >= 3*TICRATE && mo->player->panim != PA_PEEL)
+ if (mo->player->charability == CA_DASHMODE && mo->player->dashmode >= 3*TICRATE && mo->player->panim != PA_PEEL)
P_SetPlayerMobjState(mo, S_PLAY_PEEL);
if (mo->player->speed >= FixedMul(mo->player->runspeed, mo->scale) && mo->player->panim != PA_RUN)
P_SetPlayerMobjState(mo, S_PLAY_RUN);
diff --git a/src/p_user.c b/src/p_user.c
index 8c58838d1e..4db4197b8a 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -6528,7 +6528,7 @@ static void P_MovePlayer(player_t *player)
// If your peelout animation is playing, and you're
// going too slow, switch back to the run.
- if (player->panim == PA_PEEL && player->dashmode < 3*TICRATE)
+ if (player->charability == CA_DASHMODE && player->panim == PA_PEEL && player->dashmode < 3*TICRATE)
P_SetPlayerMobjState(player->mo, S_PLAY_RUN);
// If your running animation is playing, and you're
--
GitLab