summaryrefslogtreecommitdiff
path: root/src/KingSystem/Map
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2026-10-11 04:13:20 +0200
committerLéo Lam <leo@leolam.fr>2026-10-11 04:13:20 +0200
commit6e9afd0f7d6f8e037fd71e91dfdad4b45f8e7e2f (patch)
treed971f814d1cde46f56da6041037a65f512654ee3 /src/KingSystem/Map
parent49c6b5c18344de6555163b3af7044970ad9d7c5e (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')
-rw-r--r--src/KingSystem/Map/mapObject.cpp2
-rw-r--r--src/KingSystem/Map/mapObject.h4
-rw-r--r--src/KingSystem/Map/mapObjectLink.cpp6
-rw-r--r--src/KingSystem/Map/mapObjectLink.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/KingSystem/Map/mapObject.cpp b/src/KingSystem/Map/mapObject.cpp
index 10c94cbb..a22274f2 100644
--- a/src/KingSystem/Map/mapObject.cpp
+++ b/src/KingSystem/Map/mapObject.cpp
@@ -125,7 +125,7 @@ act::Actor* Object::tryGetActor(bool force) {
return sead::DynamicCast<act::Actor>(proc);
}
-bool Object::getActorWithAccessor(act::ActorLinkConstDataAccess& accessor) {
+bool Object::getActorWithAccessor(act::BaseProcAccessor& accessor) {
act::BaseProcMgr* instance = act::BaseProcMgr::instance();
if (instance == nullptr || !instance->isHighPriorityThread() || mProc == nullptr)
diff --git a/src/KingSystem/Map/mapObject.h b/src/KingSystem/Map/mapObject.h
index 5233846d..f9430d26 100644
--- a/src/KingSystem/Map/mapObject.h
+++ b/src/KingSystem/Map/mapObject.h
@@ -3,7 +3,7 @@
#include <basis/seadTypes.h>
#include <heap/seadHeap.h>
#include <prim/seadTypedBitFlag.h>
-#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
+#include "KingSystem/ActorSystem/actBaseProcAccessor.h"
#include "KingSystem/ActorSystem/actDebug.h"
#include "KingSystem/GameData/gdtFlagHandle.h"
#include "KingSystem/Map/mapDebug.h"
@@ -103,7 +103,7 @@ public:
act::BaseProc* tryGetProc(bool force);
void unlinkProc(bool force);
- bool getActorWithAccessor(act::ActorLinkConstDataAccess& accessor);
+ bool getActorWithAccessor(act::BaseProcAccessor& accessor);
act::Actor* tryGetActor(bool force);
act::Actor* getActor();
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);
diff --git a/src/KingSystem/Map/mapObjectLink.h b/src/KingSystem/Map/mapObjectLink.h
index efff5f4f..25651f5e 100644
--- a/src/KingSystem/Map/mapObjectLink.h
+++ b/src/KingSystem/Map/mapObjectLink.h
@@ -7,7 +7,7 @@
namespace ksys::act {
class Actor;
-class ActorLinkConstDataAccess;
+class BaseProcAccessor;
} // namespace ksys::act
namespace ksys::map {
@@ -65,7 +65,7 @@ enum class MapLinkDefType {
struct ObjectLink {
~ObjectLink() {}
act::Actor* getObjectActor() const;
- bool getObjectProcWithAccessor(act::ActorLinkConstDataAccess& accessor) const;
+ bool getObjectProcWithAccessor(act::BaseProcAccessor& accessor) const;
const char* getDescription() const;
static const char* getDescriptionForType(MapLinkDefType t);
static MapLinkDefType getTypeForName(const sead::SafeString& name);