diff options
| author | Léo Lam <leo@leolam.fr> | 2022-02-07 00:27:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-07 00:27:23 +0100 |
| commit | 0e00e340eece6ccf9507da1e3476b3db60f6cc10 (patch) | |
| tree | 45221220658b3051bb88b8392471607a0c34e3fa /src/KingSystem/ActorSystem | |
| parent | 0b5693c100b8643400fa8776f1a29be1bb4547a9 (diff) | |
| parent | 199c7d25526c2852a4b4a2bc4fb18a0fd2db6ad5 (diff) | |
Merge pull request #81 from ThePixelGamer/PlacementStruct
PlacementStruct1
Diffstat (limited to 'src/KingSystem/ActorSystem')
| -rw-r--r-- | src/KingSystem/ActorSystem/LOD/actLodState.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/KingSystem/ActorSystem/LOD/actLodState.cpp b/src/KingSystem/ActorSystem/LOD/actLodState.cpp index 3dff3e29..03f01885 100644 --- a/src/KingSystem/ActorSystem/LOD/actLodState.cpp +++ b/src/KingSystem/ActorSystem/LOD/actLodState.cpp @@ -3,6 +3,7 @@ #include "KingSystem/ActorSystem/actActorParam.h" #include "KingSystem/ActorSystem/actActorUtil.h" #include "KingSystem/Map/mapObject.h" +#include "KingSystem/Map/mapPlacementAreaMgr.h" #include "KingSystem/Map/mapPlacementMgr.h" #include "KingSystem/Resource/Actor/resResourceLod.h" #include "KingSystem/System/OcclusionQueryCylinder.h" @@ -156,10 +157,10 @@ LodState::LodState(sead::Heap* heap, sead::BitFlag32 flags, Actor* actor, } auto* pm = map::PlacementMgr::instance(); - map::PlacementStruct1* ps1 = nullptr; + map::PlacementAreaMgr* ps1 = nullptr; if (pm && pm->mPlacementActors && (ps1 = pm->mPlacementActors->mStruct1)) { if (!ps1->mIsOneHitChallengeActive) { - if (ps1->mFlags.isOnBit(15)) { + if (ps1->mFlags.isOn(map::PlacementAreaMgr::Flag::FinalTrial)) { if (actor->getName() == "DgnObj_DLC_IbutsuEx_Candle_A_01" || actor->getName() == "TBox_Dungeon_Stone" || actor->getName() == "DgnObj_DLC_SwordLight_A_01") { |