diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-06-28 10:05:07 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-07-01 21:02:46 -0700 |
| commit | 4cba2eb093fbc452db88e33643b3ca293ff02213 (patch) | |
| tree | 581b36877d8b17b986c12a20a351b229dfd56bdf /src/KingSystem/ActorSystem | |
| parent | 112c1f987d3831df97f46c0f9e4ae977fba59484 (diff) | |
ksys::map placement classes
Diffstat (limited to 'src/KingSystem/ActorSystem')
| -rw-r--r-- | src/KingSystem/ActorSystem/actActorConstDataAccess.h | 1 | ||||
| -rw-r--r-- | src/KingSystem/ActorSystem/actActorCreator.h | 3 | ||||
| -rw-r--r-- | src/KingSystem/ActorSystem/actBaseProc.h | 1 | ||||
| -rw-r--r-- | src/KingSystem/ActorSystem/actInfoData.h | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/src/KingSystem/ActorSystem/actActorConstDataAccess.h b/src/KingSystem/ActorSystem/actActorConstDataAccess.h index 0244893b..b78e9fbc 100644 --- a/src/KingSystem/ActorSystem/actActorConstDataAccess.h +++ b/src/KingSystem/ActorSystem/actActorConstDataAccess.h @@ -92,6 +92,7 @@ public: f32 getAttackSpHitRatio() const; s32 getAttackPower() const; + bool checkLinkTagActivated(bool a, bool b); map::ObjectLinkData* getMapObjectLinkData() const; map::Object* getMapObject() const; diff --git a/src/KingSystem/ActorSystem/actActorCreator.h b/src/KingSystem/ActorSystem/actActorCreator.h index d25e745f..ae80dd23 100644 --- a/src/KingSystem/ActorSystem/actActorCreator.h +++ b/src/KingSystem/ActorSystem/actActorCreator.h @@ -43,6 +43,9 @@ public: void setActorFactory(ActorFactory* factory) { mActorFactory = factory; } bool get5a() const { return _5a; } + sead::OffsetList<Actor>& getActorList() { return mActorList; } + sead::CriticalSection& getCS() { return mActorListCS; } + static void addScale(InstParamPack& pack, float scale); static void addScale(InstParamPack& pack, const sead::Vector3f& scale); static bool isAITreeParam(const InstParamPack::Entry& entry); diff --git a/src/KingSystem/ActorSystem/actBaseProc.h b/src/KingSystem/ActorSystem/actBaseProc.h index 6a55c2fb..761acd4b 100644 --- a/src/KingSystem/ActorSystem/actBaseProc.h +++ b/src/KingSystem/ActorSystem/actBaseProc.h @@ -102,6 +102,7 @@ public: bool isDeletedOrDeleting() const { return mState == State::Delete || mStateFlags.isOn(StateFlags::RequestDelete); } + bool isDeleteOrInvalid() const { return mState >= act::BaseProc::State::Delete; } /// For BaseProcLink or ActorLinkConstDataAccess. bool acquire(ActorLinkConstDataAccess& accessor); diff --git a/src/KingSystem/ActorSystem/actInfoData.h b/src/KingSystem/ActorSystem/actInfoData.h index bdaf24eb..b4f20b63 100644 --- a/src/KingSystem/ActorSystem/actInfoData.h +++ b/src/KingSystem/ActorSystem/actInfoData.h @@ -126,6 +126,7 @@ public: u32 getModelFlags(const char* actor) const; bool getVariationMatAnim(const char* actor, const char** anim, f32* frame) const; bool getName(al::ByamlIter* iter, const char** name, s32 idx) const; + bool sub_7100D30DF8(InvalidLifeConditions& info, const sead::Vector3f& vec); const char* getString(const char* actor, const char* key, const sead::SafeString& default_ = sead::SafeString::cEmptyString, |
