match some ai::Query

This commit is contained in:
theo3
2021-07-01 19:28:09 -07:00
parent 112c1f987d
commit 60dd80779a
53 changed files with 507 additions and 172 deletions
+3 -1
View File
@@ -40,7 +40,9 @@ public:
};
enum class ActorFlag2 {
InstEvent = 0x8,
NoDistanceCheck = 0x80,
Alive = 0x4000000,
};
enum class DeleteType {
@@ -70,7 +72,7 @@ public:
bool is_life_infinite, int i, int life) const;
virtual s32 getMaxLife();
virtual s32* getLife();
virtual LifeRecoverInfo* getLifeRecoverInfo();
void emitBasicSigOn();
@@ -165,4 +165,6 @@ bool getSameGroupActorName(sead::SafeString* name, const sead::SafeString& defau
al::ByamlIter* actor_info);
bool getSameGroupActorName(sead::SafeString* name, const sead::SafeString& actor_name);
s32 getSelectedChoiceIdx(s32 max, const char* query_name);
} // namespace ksys::act
@@ -14,6 +14,9 @@ class PlayerInfo {
public:
PlayerBase* getPlayer() const;
s32 getLife() const;
u32 getMaxHearts() const;
f32 getMaxStamina() const;
};
} // namespace ksys::act
+2
View File
@@ -207,6 +207,8 @@ public:
void allowPaletteOverride();
float getWarpMistIntensity() const { return mWarpMistIntensity; }
protected:
void init_(sead::Heap* heap) override;
void calc_() override;
+1
View File
@@ -98,6 +98,7 @@ public:
BloodMoonForceMode getBloodMoonForceMode() const { return mBloodMoonForceMode; }
bool isPlayedDemo103Or997() const { return mPlayedDemo103Or997; }
bool isFindDungeonActivated() const { return mFindDungeonActivated; }
bool wasBloodyDayAndDayPassed() const { return mWasBloodyDayAndDayPassed; }
bool isResetGdtOnNextSceneUnloadForBloodMoon() const {
return mResetGdtOnNextSceneUnloadForBloodMoon;
}