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/actBaseProcHandle.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/KingSystem/ActorSystem/actBaseProcHandle.cpp') diff --git a/src/KingSystem/ActorSystem/actBaseProcHandle.cpp b/src/KingSystem/ActorSystem/actBaseProcHandle.cpp index cc780cc3..371f7c43 100644 --- a/src/KingSystem/ActorSystem/actBaseProcHandle.cpp +++ b/src/KingSystem/ActorSystem/actBaseProcHandle.cpp @@ -1,7 +1,7 @@ #include "KingSystem/ActorSystem/actBaseProcHandle.h" #include -#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h" #include "KingSystem/ActorSystem/actBaseProc.h" +#include "KingSystem/ActorSystem/actBaseProcAccessor.h" #include "KingSystem/Utils/Debug.h" namespace ksys::act { @@ -80,7 +80,7 @@ BaseProc* BaseProcHandle::releaseProc() { BaseProc* proc = nullptr; { - ActorLinkConstDataAccess accessor; + BaseProcAccessor accessor; { const auto lock = sead::makeScopedLock(unit->getCS()); if (unit->compareExchangeHandle(this, &gDummyProcHandle)) { @@ -106,7 +106,7 @@ BaseProc* BaseProcHandle::releaseAndWakeProc() { BaseProc* proc = nullptr; { - ActorLinkConstDataAccess accessor; + BaseProcAccessor accessor; { const auto lock = sead::makeScopedLock(unit->getCS()); if (unit->compareExchangeHandle(this, &gDummyProcHandle)) { @@ -172,7 +172,7 @@ bool BaseProcUnit::deleteProc([[maybe_unused]] u32 x, BaseProcHandle* handle) { __builtin_assume(x); #endif - ActorLinkConstDataAccess accessor; + BaseProcAccessor accessor; { const auto lock = sead::makeScopedLock(mCS); -- cgit v1.2.3