diff options
| author | Léo Lam <leo@leolam.fr> | 2026-10-11 04:13:20 +0200 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2026-10-11 04:13:20 +0200 |
| commit | 6e9afd0f7d6f8e037fd71e91dfdad4b45f8e7e2f (patch) | |
| tree | d971f814d1cde46f56da6041037a65f512654ee3 /src/KingSystem/ActorSystem/actBaseProcLink.cpp | |
| parent | 49c6b5c18344de6555163b3af7044970ad9d7c5e (diff) | |
ksys/act: rename the actor accessor to ActorLinkConstDataAccess
The 0x18-sized accessor appears to be named ActorLinkConstDataAccess
based on a source path string in the Wii U build. The 0x10-sized
base class (which we had given the name to) only holds a BaseProc and
its dtor/acquire functions live in a separate TU so let's rename it
BaseProcAccessor (unofficial name).
acquireActor is a header inline whose one copy landed in the BeamBase
object. Nothing in BeamBase calls it, so the BeamBase function that used
it was probably dead-stripped by the linker.
(AI assisted using Claude Opus 5.5)
Diffstat (limited to 'src/KingSystem/ActorSystem/actBaseProcLink.cpp')
| -rw-r--r-- | src/KingSystem/ActorSystem/actBaseProcLink.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/KingSystem/ActorSystem/actBaseProcLink.cpp b/src/KingSystem/ActorSystem/actBaseProcLink.cpp index 935a1f33..d2dcce17 100644 --- a/src/KingSystem/ActorSystem/actBaseProcLink.cpp +++ b/src/KingSystem/ActorSystem/actBaseProcLink.cpp @@ -1,8 +1,8 @@ #include "KingSystem/ActorSystem/actBaseProcLink.h" #include <prim/seadScopedLock.h> #include <thread/seadThread.h> -#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h" #include "KingSystem/ActorSystem/actBaseProc.h" +#include "KingSystem/ActorSystem/actBaseProcAccessor.h" #include "KingSystem/ActorSystem/actBaseProcMgr.h" namespace ksys::act { @@ -39,7 +39,7 @@ bool BaseProcLink::hasProcById(BaseProc* proc) const { return proc != nullptr & mId != cInvalidId && mId == proc->getId(); } -BaseProc* BaseProcLink::getProc(ActorLinkConstDataAccess* accessor, BaseProc* other_proc) const { +BaseProc* BaseProcLink::getProc(BaseProcAccessor* accessor, BaseProc* other_proc) const { return getProcInContext([&](BaseProc* proc, bool) -> BaseProc* { if (proc && acquireProc(accessor, proc, "frm::BaseProcLink") && BaseProcMgr::instance()->isAccessingProcSafe(proc, other_proc)) { @@ -49,7 +49,7 @@ BaseProc* BaseProcLink::getProc(ActorLinkConstDataAccess* accessor, BaseProc* ot }); } -BaseProc* BaseProcLink::getProc(ActorLinkConstDataAccess* accessor) const { +BaseProc* BaseProcLink::getProc(BaseProcAccessor* accessor) const { return getProcInContext([&](BaseProc* proc, bool) -> BaseProc* { if (proc && acquireProc(accessor, proc, "frm::BaseProcLink")) return proc; |
