From f66248257fdcb7bd07750c04b4e2bb28b3f5a04f Mon Sep 17 00:00:00 2001 From: Arceveti <73617174+Arceveti@users.noreply.github.com> Date: Thu, 14 Oct 2021 12:01:49 -0700 Subject: [PATCH] Use m->heldObj instead of m->usedObj for GROUND_TURN_FIX check --- src/game/mario_actions_moving.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c index 8d6385856..a3473045b 100644 --- a/src/game/mario_actions_moving.c +++ b/src/game/mario_actions_moving.c @@ -450,7 +450,7 @@ void update_walking_speed(struct MarioState *m) { #endif #ifdef GROUND_TURN_FIX - if ((m->usedObj == NULL) && !(m->action & ACT_FLAG_SHORT_HITBOX)) { + if ((m->heldObj == NULL) && !(m->action & ACT_FLAG_SHORT_HITBOX)) { if (m->forwardVel >= 16.0f) { s16 turnRange = abs_angle_diff(m->faceAngle[1], m->intendedYaw); f32 fac = (m->forwardVel + m->intendedMag);