From 6e9afd0f7d6f8e037fd71e91dfdad4b45f8e7e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 11 Oct 2026 04:13:20 +0200 Subject: 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) --- src/KingSystem/ActorSystem/actBaseProcLink.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/KingSystem/ActorSystem/actBaseProcLink.cpp') 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 #include -#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; -- cgit v1.2.3