diff options
| author | Léo Lam <leo@leolam.fr> | 2026-10-06 04:10:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-10-06 04:10:42 +0100 |
| commit | 4d2c07a45ade7b6efa5dd859bcc983a9bff0e1ef (patch) | |
| tree | 0019b105b53ec817ebf677e484e475a0bc2cedf2 /src/Game/Actor/actPlayerCreateMgr.cpp | |
| parent | 891c0a8494c80e8156968d6a4e3cf609b95fd228 (diff) | |
| parent | 9d6a597e91fac5ecdca3f9903f90c7bdf5accd96 (diff) | |
Merge pull request #217 from leoetlino/stack/03b-side-ownership
Move misplaced code between KingSystem and U-King
Diffstat (limited to 'src/Game/Actor/actPlayerCreateMgr.cpp')
| -rw-r--r-- | src/Game/Actor/actPlayerCreateMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 <prim/seadRuntimeTypeInfo.h> #include <prim/seadStringBuilder.h> +#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); |