ksys/act: Add Actor::getMaxLife and fix encapsulation

2 files changed, 6 insertions, 1 deletions

diff --git a/src/KingSystem/ActorSystem/actActor.h b/src/KingSystem/ActorSystem/actActor.h
index cb33476c..83315c02 100644
--- a/src/KingSystem/ActorSystem/actActor.h
+++ b/src/KingSystem/ActorSystem/actActor.h
@@ -16,6 +16,10 @@ public:
 
     SEAD_RTTI_OVERRIDE(Actor, BaseProc)
 
+    const ActorParam* getParam() const { return mActorParam; }
+
+    virtual s32 getMaxLife();
+
     virtual LifeRecoverInfo* getLifeRecoverInfo();
 
     void emitBasicSigOn();
@@ -23,6 +27,7 @@ public:
 
     void nullsub_4649();  // Some kind of logging which has been excluded from the build?
 
+protected:
     u8 TEMP1[0x3F4];  // FIXME
     ActorParam* mActorParam;
     u8 TEMP2[0x2C0];  // FIXME
diff --git a/src/KingSystem/ActorSystem/actActorCaptureMgr.cpp b/src/KingSystem/ActorSystem/actActorCaptureMgr.cpp
index e1a530b5..32f1525b 100644
--- a/src/KingSystem/ActorSystem/actActorCaptureMgr.cpp
+++ b/src/KingSystem/ActorSystem/actActorCaptureMgr.cpp
@@ -36,7 +36,7 @@ void ActorCaptureMgr::setCamera(Camera* camera) {
 }
 
 void ActorCaptureMgr::loadCaptureParam() {
-    if (!mActor || !mActor->mActorParam)
+    if (!mActor || !mActor->getParam())
         return;
 
     const char* name = getCapturedActorName();