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/Game/UI/uiPauseMenuDataMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Game/UI/uiPauseMenuDataMgr.cpp') diff --git a/src/Game/UI/uiPauseMenuDataMgr.cpp b/src/Game/UI/uiPauseMenuDataMgr.cpp index ec352d31..8b146430 100644 --- a/src/Game/UI/uiPauseMenuDataMgr.cpp +++ b/src/Game/UI/uiPauseMenuDataMgr.cpp @@ -14,8 +14,8 @@ #include "Game/UI/uiUtils.h" #include "Game/gameItemUtils.h" #include "KingSystem/AOC/aocManager.h" -#include "KingSystem/ActorSystem/actActorConstDataAccess.h" #include "KingSystem/ActorSystem/actActorHeapUtil.h" +#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h" #include "KingSystem/ActorSystem/actActorUtil.h" #include "KingSystem/ActorSystem/actBaseProcLink.h" #include "KingSystem/ActorSystem/actInfoCommon.h" @@ -1610,7 +1610,7 @@ void PauseMenuDataMgr::removeGrabbedItems() { bool PauseMenuDataMgr::removeGrabbedItem(ksys::act::BaseProcLink* link) { bool found = false; if (link && link->hasProc()) { - ksys::act::ActorConstDataAccess accessor; + ksys::act::ActorLinkConstDataAccess accessor; ksys::act::acquireActor(link, &accessor); const auto name = accessor.getName(); auto& cs = mCritSection; -- cgit v1.2.3