From 1dee1da7e33aa4f5dbe39a051f9d908ea14d0d5d Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Tue, 26 Nov 2019 10:11:52 +0000
Subject: [PATCH] Fix issue where you can get stuck in pain frames after
 stepping up, or after sliding (resolves #369).

---
 src/p_user.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/p_user.c b/src/p_user.c
index 7a80031b8c..a3264b6756 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -5962,6 +5962,8 @@ static void P_3dMovement(player_t *player)
 	// When sliding, don't allow forward/back
 	if (player->pflags & PF_SLIDING)
 		cmd->forwardmove = 0;
+	else if (onground && player->mo->state == states+S_PLAY_PAIN)
+		P_SetPlayerMobjState(player->mo, S_PLAY_WALK);
 
 	player->aiming = cmd->aiming<<FRACBITS;
 
-- 
GitLab