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/Map/mapObjectLink.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/Map/mapObjectLink.cpp')
| -rw-r--r-- | src/KingSystem/Map/mapObjectLink.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/KingSystem/Map/mapObjectLink.cpp b/src/KingSystem/Map/mapObjectLink.cpp index 700ab069..27fd484f 100644 --- a/src/KingSystem/Map/mapObjectLink.cpp +++ b/src/KingSystem/Map/mapObjectLink.cpp @@ -1,6 +1,6 @@ #include "KingSystem/Map/mapObjectLink.h" #include <container/seadBuffer.h> -#include "KingSystem/ActorSystem/actActorConstDataAccess.h" +#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h" #include "KingSystem/Map/mapObject.h" #include "KingSystem/Map/mapObjectGenGroup.h" #include "KingSystem/Map/mapRail.h" @@ -129,7 +129,7 @@ act::Actor* ObjectLink::getObjectActor() const { return other_obj->tryGetActor(false); } -bool ObjectLink::getObjectProcWithAccessor(act::ActorLinkConstDataAccess& accessor) const { +bool ObjectLink::getObjectProcWithAccessor(act::BaseProcAccessor& accessor) const { if (other_obj == nullptr) return accessor.acquire(nullptr); else @@ -208,7 +208,7 @@ bool ObjectLinkArray::checkLink(MapLinkDefType t, bool b) { return false; done: - act::ActorConstDataAccess acc{}; + act::ActorLinkConstDataAccess acc{}; if (link->other_obj != nullptr) link->other_obj->getActorWithAccessor(acc); |
