diff options
| author | Léo Lam <leo@leolam.fr> | 2026-10-15 22:56:29 +0100 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2026-10-19 02:52:18 +0300 |
| commit | a955a9482b8c107f69e0bcff31a74ff20087f5b8 (patch) | |
| tree | 797ccd39d0513b144e5e28887727816919e31a43 /src | |
| parent | 689c34adf7d856cbc3fd75b3fe4ffc5805702f8e (diff) | |
uking: name AutoPlacement::reset and AutoPlacementMgr creator functions
The names come from the IDB. AddAutoPlacementCreator registers its actor
with addCreator on enter and unregisters it with removeCreator on leave.
(AI assisted using Claude Opus 5.5)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Game/Actor/Action/actionAddAutoPlacementCreator.cpp | 4 | ||||
| -rw-r--r-- | src/Game/AutoPlacement/AutoPlacement.cpp | 4 | ||||
| -rw-r--r-- | src/Game/AutoPlacement/AutoPlacement.h | 2 | ||||
| -rw-r--r-- | src/Game/AutoPlacement/AutoPlacementMgr.h | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/Game/Actor/Action/actionAddAutoPlacementCreator.cpp b/src/Game/Actor/Action/actionAddAutoPlacementCreator.cpp index 8a1d4e67..774522c9 100644 --- a/src/Game/Actor/Action/actionAddAutoPlacementCreator.cpp +++ b/src/Game/Actor/Action/actionAddAutoPlacementCreator.cpp @@ -44,7 +44,7 @@ void AddAutoPlacementCreator::enter_(ksys::act::ai::InlineParamPack* params) { } if (AutoPlacementMgr::instance() != nullptr && - AutoPlacementMgr::instance()->sub_7100659E40(mActor, mActorName_m, *mCount_m, is_box)) { + AutoPlacementMgr::instance()->addCreator(mActor, mActorName_m, *mCount_m, is_box)) { actor->setDeleteDistance(actor->getDeleteDistance() + 100.0f); mInitialised = true; } @@ -57,7 +57,7 @@ void AddAutoPlacementCreator::leave_() { return; if (AutoPlacementMgr::instance() != nullptr) - AutoPlacementMgr::instance()->sub_7100659F94(mActor); + AutoPlacementMgr::instance()->removeCreator(mActor); mInitialised = false; } diff --git a/src/Game/AutoPlacement/AutoPlacement.cpp b/src/Game/AutoPlacement/AutoPlacement.cpp index d655fb7d..36193030 100644 --- a/src/Game/AutoPlacement/AutoPlacement.cpp +++ b/src/Game/AutoPlacement/AutoPlacement.cpp @@ -64,7 +64,7 @@ void ActorSpawnInfo::calcSpawnLocations() { } void AutoPlacement::setSpawnInfo(const sead::SafeString& name, s32 count) { - sub_710064CF60(false); + reset(false); ActorSpawnInfo* info = &mSpawnInfo[0]; auto* flow = AutoPlacementFlowMgr::instance()->getFlow(name, mNearFlag == 0xff); if (flow != nullptr) { @@ -84,7 +84,7 @@ void AutoPlacement::setSpawnInfo(const sead::SafeString& name, s32 count) { } void AutoPlacement::sub_710064DA54() { - sub_710064CF60(false); + reset(false); _8 = 2; } diff --git a/src/Game/AutoPlacement/AutoPlacement.h b/src/Game/AutoPlacement/AutoPlacement.h index 5febc299..38f60fff 100644 --- a/src/Game/AutoPlacement/AutoPlacement.h +++ b/src/Game/AutoPlacement/AutoPlacement.h @@ -125,7 +125,7 @@ public: bool sub_710064CBFC(sead::Heap* heap, u8 flag, s32 num_spawn, s32 num_obj); u32 sub_710064CD80(u32, u32); - void sub_710064CF60(bool force); + void reset(bool force); bool hasNearbyPlacedActorWithNameInGroup(const sead::SafeString& name, const sead::Vector3f& distance); diff --git a/src/Game/AutoPlacement/AutoPlacementMgr.h b/src/Game/AutoPlacement/AutoPlacementMgr.h index cad8d489..81afd60f 100644 --- a/src/Game/AutoPlacement/AutoPlacementMgr.h +++ b/src/Game/AutoPlacement/AutoPlacementMgr.h @@ -19,9 +19,9 @@ public: AutoPlacementMgr(); virtual ~AutoPlacementMgr(); - bool sub_7100659E40(ksys::act::Actor* actor, const sead::SafeString& actor_name, int count, - bool is_box); - void sub_7100659F94(ksys::act::Actor* actor); + bool addCreator(ksys::act::Actor* actor, const sead::SafeString& actor_name, int count, + bool is_box); + void removeCreator(ksys::act::Actor* actor); // 0x0000007100654e44 bool threadFn(); |
