From d8da4fc5f2f159f2ea3386d7018e61629759bc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 28 Sep 2026 03:39:30 +0200 Subject: Actor: PlayerInfo/PlayerBase are game, GameConfig ksys Every decomp user of PlayerInfo is game code, and PlayerBase sits right above Player. GameConfig.h models the engine base that links at GameConfig's slot in KingSystem/System. (AI assisted using Claude Fable 5.1 and Claude Opus 5.5) --- src/Game/Actor/actPlayerCreateMgr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Game/Actor/actPlayerCreateMgr.cpp') diff --git a/src/Game/Actor/actPlayerCreateMgr.cpp b/src/Game/Actor/actPlayerCreateMgr.cpp index f573f245..f053b40d 100644 --- a/src/Game/Actor/actPlayerCreateMgr.cpp +++ b/src/Game/Actor/actPlayerCreateMgr.cpp @@ -1,10 +1,11 @@ #include "Game/Actor/actPlayerCreateMgr.h" #include #include +#include "Game/Actor/Player/actPlayerBase.h" +#include "Game/Actor/Player/actPlayerInfo.h" #include "Game/Actor/actPlayerCreateUtils.h" #include "Game/Actor/actWeapon.h" #include "Game/UI/uiPauseMenuDataMgr.h" -#include "KingSystem/ActorSystem/Profiles/actPlayerBase.h" #include "KingSystem/ActorSystem/Profiles/actWeaponBase.h" #include "KingSystem/ActorSystem/actActorConstDataAccess.h" #include "KingSystem/ActorSystem/actActorCreator.h" @@ -13,7 +14,6 @@ #include "KingSystem/ActorSystem/actInfoCommon.h" #include "KingSystem/ActorSystem/actInfoData.h" #include "KingSystem/ActorSystem/actInstParamPack.h" -#include "KingSystem/ActorSystem/actPlayerInfo.h" #include "KingSystem/GameData/gdtCommonFlagsUtils.h" namespace uking::act { @@ -154,7 +154,7 @@ void CreatePlayerEquipActorMgr::requestCreateWeapon(s32 slot_idx, const sead::Sa auto scope = mTracer.trace()->makeScope("requestCreateWeapon", caller, 1); deleteLoadingProc(slot_idx); - auto* player = ksys::act::PlayerInfo::instance()->getPlayer(); + auto* player = PlayerInfo::instance()->getPlayer(); sead::Matrix34f pos; pos.makeT(player->getMtx().getTranslation()); @@ -213,7 +213,7 @@ void CreatePlayerEquipActorMgr::requestCreateArmor(s32 slot_idx, const sead::Saf { ksys::act::ActorConstDataAccess access; - ksys::act::acquireActor(&ksys::act::PlayerInfo::instance()->getPlayerLink(), &access); + ksys::act::acquireActor(&PlayerInfo::instance()->getPlayerLink(), &access); sead::Vector3f pos; access.getActorMtx().getTranslation(pos); params->addPosition(pos); -- cgit v1.2.3