From 3add792986cc1c1a8c399be515cf2799c53e8aa2 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 4 Aug 2019 19:11:58 +0100
Subject: [PATCH] Fix spindashing on a moving surface causing you to change
state to rolling instead of spindashing.
(MI said I could commit to master since it was only a single line.)
---
src/p_user.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/p_user.c b/src/p_user.c
index 58ea03ca6f..0a338a6e71 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2204,7 +2204,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
if (player->pflags & PF_SPINNING)
{
- if (player->mo->state-states != S_PLAY_ROLL)
+ if (player->mo->state-states != S_PLAY_ROLL && !(player->pflags & PF_STARTDASH))
{
P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
S_StartSound(player->mo, sfx_spin);
--
GitLab