From 931f7888c30e5f295eaab5f098c0e8deac065d95 Mon Sep 17 00:00:00 2001 From: Aetias Date: Thu, 22 May 2025 22:10:37 +0200 Subject: Rename `mFollowActor` to `mFollowObject` --- src/05/Player/LinkStateMove.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/05/Player/LinkStateMove.cpp') diff --git a/src/05/Player/LinkStateMove.cpp b/src/05/Player/LinkStateMove.cpp index 815d9060..076707fe 100644 --- a/src/05/Player/LinkStateMove.cpp +++ b/src/05/Player/LinkStateMove.cpp @@ -207,7 +207,7 @@ ARM void LinkStateMove::vfunc_1c() { } ARM bool LinkStateMove::vfunc_3c() { - if ((gPlayerControl->GetFollowActor() == NULL) && (gPlayerControl->mFollowActor == NULL) && + if ((gPlayerControl->GetFollowActor() == NULL) && (gPlayerControl->mFollowObject == NULL) && (this->Get_PlayerControlData_Unk120() != 2) && (this->Get_PlayerControlData_Unk120() != 3)) { return true; -- cgit v1.2.3 From e138813392a8606b2b87e9463d8fb0219fef269d Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 24 May 2025 08:38:48 +0200 Subject: Fix match --- src/05/Player/LinkStateMove.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/05/Player/LinkStateMove.cpp') diff --git a/src/05/Player/LinkStateMove.cpp b/src/05/Player/LinkStateMove.cpp index 076707fe..0ca48089 100644 --- a/src/05/Player/LinkStateMove.cpp +++ b/src/05/Player/LinkStateMove.cpp @@ -200,6 +200,7 @@ ARM void LinkStateMove::vfunc_1c() { } } ActorRef sp4; + sp4.Reset(); this->PlayerLinkBase_vfunc_58(0, &sp4); return; } -- cgit v1.2.3