From d7a612302ec79a5ddd45088a7ddc695f24f64822 Mon Sep 17 00:00:00 2001 From: Matthew Coppola Date: Sun, 17 Nov 2024 03:44:03 -0500 Subject: [PATCH] Discard player momentum during autowalk sequences Prevents potential softlock during The Duel. --- src/game/player.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/game/player.c b/src/game/player.c index b2fdf891b..b9bb2f83c 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -3107,6 +3107,9 @@ void playerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist) { playerSetTickMode(TICKMODE_AUTOWALK); + // Prevents momentum from being preserved. Fixes potential softlock during The Duel. + g_Vars.currentplayer->resetheadpos = true; + g_Vars.currentplayer->autocontrol_aimpad = aimpad; g_Vars.currentplayer->autocontrol_walkspeed = walkspeed; g_Vars.currentplayer->autocontrol_turnspeed = turnspeed;