summaryrefslogtreecommitdiff
path: root/src/Game
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/Game
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/Game')
-rw-r--r--src/Game/AOC/aocHardModeManager.cpp4
-rw-r--r--src/Game/AOC/aocHardModeManager.h4
-rw-r--r--src/Game/Actor/AI/aiAirOctaFlyUp.cpp6
-rw-r--r--src/Game/Actor/Damage/dmgDamageManagerBase.cpp4
-rw-r--r--src/Game/Actor/Player/actPlayerInfo.cpp5
-rw-r--r--src/Game/Actor/actPlayerCreateMgr.cpp3
-rw-r--r--src/Game/Actor/actWeapon.cpp8
-rw-r--r--src/Game/Actor/actWeapon.h6
-rw-r--r--src/Game/UI/uiPauseMenuDataMgr.cpp4
9 files changed, 22 insertions, 22 deletions
diff --git a/src/Game/AOC/aocHardModeManager.cpp b/src/Game/AOC/aocHardModeManager.cpp
index 479fef42..9af17016 100644
--- a/src/Game/AOC/aocHardModeManager.cpp
+++ b/src/Game/AOC/aocHardModeManager.cpp
@@ -98,11 +98,11 @@ bool HardModeManager::shouldCreateLifeRecoverInfo(ksys::act::Actor* actor) {
}
bool HardModeManager::shouldApplyMasterModeDamageMultiplier(
- const ksys::act::ActorConstDataAccess& accessor) {
+ const ksys::act::ActorLinkConstDataAccess& accessor) {
if (!accessor.hasProc())
return false;
- ksys::act::ActorConstDataAccess parent;
+ ksys::act::ActorLinkConstDataAccess parent;
if (accessor.hasConnectedCalcParent() && accessor.acquireConnectedCalcParent(&parent))
return shouldApplyMasterModeDamageMultiplier(parent);
diff --git a/src/Game/AOC/aocHardModeManager.h b/src/Game/AOC/aocHardModeManager.h
index 375438a2..c6c51db2 100644
--- a/src/Game/AOC/aocHardModeManager.h
+++ b/src/Game/AOC/aocHardModeManager.h
@@ -4,7 +4,7 @@
#include <prim/seadBitFlag.h>
#include <prim/seadEnum.h>
#include <prim/seadSafeString.h>
-#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
+#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
#include "KingSystem/GameData/gdtManager.h"
#include "KingSystem/Map/mapObject.h"
#include "KingSystem/Resource/resHandle.h"
@@ -42,7 +42,7 @@ public:
static bool shouldCreateLifeRecoverInfo(ksys::act::Actor* actor);
static bool
- shouldApplyMasterModeDamageMultiplier(const ksys::act::ActorConstDataAccess& accessor);
+ shouldApplyMasterModeDamageMultiplier(const ksys::act::ActorLinkConstDataAccess& accessor);
static void buffDamage(s32& damage);
bool isTestOfStrengthShrine() const;
diff --git a/src/Game/Actor/AI/aiAirOctaFlyUp.cpp b/src/Game/Actor/AI/aiAirOctaFlyUp.cpp
index 2c6afbbb..40c27583 100644
--- a/src/Game/Actor/AI/aiAirOctaFlyUp.cpp
+++ b/src/Game/Actor/AI/aiAirOctaFlyUp.cpp
@@ -3,7 +3,7 @@
#include "Game/Actor/AI/aiAirOctaRoot.h"
#include "KingSystem/ActorSystem/AS/ASList.h"
#include "KingSystem/ActorSystem/actActor.h"
-#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
+#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
#include "KingSystem/ActorSystem/actAiAi.h"
#include "KingSystem/ActorSystem/actBaseProcLink.h"
#include "KingSystem/System/VFR.h"
@@ -49,7 +49,7 @@ void AirOctaFlyUp::calc_() {
}
if ((fly_up_multiplier * 0.5f >= 1.f && y >= getDataMgr()->vec_F8.y) ||
mElapsedTime >= (*mFlyUpDuration_s * 3.0f)) {
- ksys::act::ActorConstDataAccess linkData;
+ ksys::act::ActorLinkConstDataAccess linkData;
if (ksys::act::acquireActor(&getDataMgr()->mBaseProcLink, &linkData)) {
mUserData = 3;
getActor()->sendMessage(*linkData.getMessageTransceiverId(), 0x80000C8, &mUserData,
@@ -58,7 +58,7 @@ void AirOctaFlyUp::calc_() {
}
} else if (y - AirOctaY >= *mTargetDistance_d * 0.9f ||
mElapsedTime >= (*mFlyUpDuration_s * 3.0f)) {
- ksys::act::ActorConstDataAccess linkData;
+ ksys::act::ActorLinkConstDataAccess linkData;
if (ksys::act::acquireActor(&getDataMgr()->mBaseProcLink, &linkData)) {
mUserData = 2;
getActor()->sendMessage(*linkData.getMessageTransceiverId(), 0x80000C8, &mUserData,
diff --git a/src/Game/Actor/Damage/dmgDamageManagerBase.cpp b/src/Game/Actor/Damage/dmgDamageManagerBase.cpp
index 08557ba6..26e8876b 100644
--- a/src/Game/Actor/Damage/dmgDamageManagerBase.cpp
+++ b/src/Game/Actor/Damage/dmgDamageManagerBase.cpp
@@ -2,7 +2,7 @@
#include "Game/AOC/aocHardModeManager.h"
#include "Game/Actor/Damage/dmgDamageCallback.h"
#include "KingSystem/ActorSystem/actActor.h"
-#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
+#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
#include "KingSystem/ActorSystem/actActorParam.h"
#include "KingSystem/ActorSystem/actActorUtil.h"
#include "KingSystem/ActorSystem/actLifeRecoveryInfo.h"
@@ -152,7 +152,7 @@ void DamageManagerBase::tryBuffDamage(s32& damage) {
return;
}
- ksys::act::ActorConstDataAccess acc;
+ ksys::act::ActorLinkConstDataAccess acc;
ksys::act::acquireActor(getAttacker(), &acc);
if (aoc::HardModeManager::shouldApplyMasterModeDamageMultiplier(acc)) {
aoc::HardModeManager::buffDamage(damage);
diff --git a/src/Game/Actor/Player/actPlayerInfo.cpp b/src/Game/Actor/Player/actPlayerInfo.cpp
index ec44523f..83bf2f8a 100644
--- a/src/Game/Actor/Player/actPlayerInfo.cpp
+++ b/src/Game/Actor/Player/actPlayerInfo.cpp
@@ -1,6 +1,5 @@
#include "Game/Actor/Player/actPlayerInfo.h"
#include "Game/Actor/Player/actPlayerBase.h"
-#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
#include "KingSystem/ActorSystem/actBaseProc.h"
#include "KingSystem/ActorSystem/actBaseProcMgr.h"
@@ -116,7 +115,7 @@ PlayerBase* PlayerInfo::getPlayerUnchecked() {
}
sead::Vector3f& PlayerInfo::getPlayerPos() {
- ksys::act::ActorConstDataAccess accessor;
+ ksys::act::ActorLinkConstDataAccess accessor;
ksys::act::acquireActor(&mPlayerLink, &accessor);
accessor.debugLog(1, "getPlayerPos");
@@ -124,7 +123,7 @@ sead::Vector3f& PlayerInfo::getPlayerPos() {
}
sead::Vector3f& PlayerInfo::getPlayerPosForPostCalc() {
- ksys::act::ActorConstDataAccess accessor;
+ ksys::act::ActorLinkConstDataAccess accessor;
ksys::act::acquireActor(&mPlayerLink, &accessor);
accessor.debugLog(0, "getPlayerPosForPostCalc");
diff --git a/src/Game/Actor/actPlayerCreateMgr.cpp b/src/Game/Actor/actPlayerCreateMgr.cpp
index f053b40d..51c9b122 100644
--- a/src/Game/Actor/actPlayerCreateMgr.cpp
+++ b/src/Game/Actor/actPlayerCreateMgr.cpp
@@ -7,7 +7,6 @@
#include "Game/Actor/actWeapon.h"
#include "Game/UI/uiPauseMenuDataMgr.h"
#include "KingSystem/ActorSystem/Profiles/actWeaponBase.h"
-#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
#include "KingSystem/ActorSystem/actActorCreator.h"
#include "KingSystem/ActorSystem/actActorHeapUtil.h"
#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
@@ -212,7 +211,7 @@ void CreatePlayerEquipActorMgr::requestCreateArmor(s32 slot_idx, const sead::Saf
}
{
- ksys::act::ActorConstDataAccess access;
+ ksys::act::ActorLinkConstDataAccess access;
ksys::act::acquireActor(&PlayerInfo::instance()->getPlayerLink(), &access);
sead::Vector3f pos;
access.getActorMtx().getTranslation(pos);
diff --git a/src/Game/Actor/actWeapon.cpp b/src/Game/Actor/actWeapon.cpp
index c4281c19..f54e47ba 100644
--- a/src/Game/Actor/actWeapon.cpp
+++ b/src/Game/Actor/actWeapon.cpp
@@ -1,7 +1,7 @@
#include "Game/Actor/actWeapon.h"
#include <random/seadGlobalRandom.h>
#include "Game/UI/uiPauseMenuDataMgr.h"
-#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
+#include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
#include "KingSystem/ActorSystem/actGlobalParameter.h"
#include "KingSystem/ActorSystem/actInfoCommon.h"
#include "KingSystem/ActorSystem/actInfoData.h"
@@ -409,7 +409,8 @@ bool WeaponModifierRanges::loadTierBlue(const ksys::res::GParamList& gparamlist)
}
// NON_MATCHING: isConfigValid() somehow does not match when inlined (but matches the Wii U version)
-bool WeaponModifierInfo::pickRandomBlueModifierActor(const ksys::act::ActorConstDataAccess& acc) {
+bool WeaponModifierInfo::pickRandomBlueModifierActor(
+ const ksys::act::ActorLinkConstDataAccess& acc) {
WeaponModifierRanges ranges;
const auto& gparamlist = *acc.getGParamList();
if (ranges.loadTierBlue(gparamlist)) {
@@ -460,7 +461,8 @@ bool WeaponModifierRanges::loadTierYellow(const ksys::res::GParamList& gparamlis
}
// NON_MATCHING: isConfigValid() somehow does not match when inlined (but matches the Wii U version)
-bool WeaponModifierInfo::pickRandomYellowModifierActor(const ksys::act::ActorConstDataAccess& acc) {
+bool WeaponModifierInfo::pickRandomYellowModifierActor(
+ const ksys::act::ActorLinkConstDataAccess& acc) {
WeaponModifierRanges ranges;
const auto& gparamlist = *acc.getGParamList();
if (ranges.loadTierYellow(gparamlist)) {
diff --git a/src/Game/Actor/actWeapon.h b/src/Game/Actor/actWeapon.h
index 56631ab1..6a5ffb81 100644
--- a/src/Game/Actor/actWeapon.h
+++ b/src/Game/Actor/actWeapon.h
@@ -5,7 +5,7 @@
#include <prim/seadTypedBitFlag.h>
namespace ksys::act {
-class ActorConstDataAccess;
+class ActorLinkConstDataAccess;
class InstParamPack;
namespace ai {
struct InlineParamPack;
@@ -94,8 +94,8 @@ struct WeaponModifierInfo {
bool pickRandomBlueModifierTbox(const sead::SafeString& actor);
bool pickRandomYellowModifierTbox(const sead::SafeString& actor);
- bool pickRandomBlueModifierActor(const ksys::act::ActorConstDataAccess& acc);
- bool pickRandomYellowModifierActor(const ksys::act::ActorConstDataAccess& acc);
+ bool pickRandomBlueModifierActor(const ksys::act::ActorLinkConstDataAccess& acc);
+ bool pickRandomYellowModifierActor(const ksys::act::ActorLinkConstDataAccess& acc);
void setModifier(WeaponModifier modifier, s32 value_) {
flags.setDirect((flags.getDirect() & u32(WeaponModifier::IsYellow)) | u32(modifier));
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;