summaryrefslogtreecommitdiff
path: root/src/KingSystem/ActorSystem
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2021-07-01 19:28:09 -0700
committertheo3 <arisstephenson2@gmail.com>2021-07-01 21:05:10 -0700
commit60dd80779a92120c74e7bda9e1ccf2695e2c7c19 (patch)
tree4d76dc03072740a41634893a9062d6a7e4626f68 /src/KingSystem/ActorSystem
parent112c1f987d3831df97f46c0f9e4ae977fba59484 (diff)
match some ai::Query
Diffstat (limited to 'src/KingSystem/ActorSystem')
-rw-r--r--src/KingSystem/ActorSystem/actActor.h4
-rw-r--r--src/KingSystem/ActorSystem/actActorUtil.h2
-rw-r--r--src/KingSystem/ActorSystem/actPlayerInfo.h3
3 files changed, 8 insertions, 1 deletions
diff --git a/src/KingSystem/ActorSystem/actActor.h b/src/KingSystem/ActorSystem/actActor.h
index 3c109432..6b077653 100644
--- a/src/KingSystem/ActorSystem/actActor.h
+++ b/src/KingSystem/ActorSystem/actActor.h
@@ -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();
diff --git a/src/KingSystem/ActorSystem/actActorUtil.h b/src/KingSystem/ActorSystem/actActorUtil.h
index b8ec6b79..cc642e99 100644
--- a/src/KingSystem/ActorSystem/actActorUtil.h
+++ b/src/KingSystem/ActorSystem/actActorUtil.h
@@ -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
diff --git a/src/KingSystem/ActorSystem/actPlayerInfo.h b/src/KingSystem/ActorSystem/actPlayerInfo.h
index 9ceb53b2..c356c3f9 100644
--- a/src/KingSystem/ActorSystem/actPlayerInfo.h
+++ b/src/KingSystem/ActorSystem/actPlayerInfo.h
@@ -14,6 +14,9 @@ class PlayerInfo {
public:
PlayerBase* getPlayer() const;
+ s32 getLife() const;
+ u32 getMaxHearts() const;
+ f32 getMaxStamina() const;
};
} // namespace ksys::act