ksys/act: Fix ActorParam encapsulation

1 files changed, 18 insertions, 12 deletions

diff --git a/src/KingSystem/ActorSystem/actActorParam.h b/src/KingSystem/ActorSystem/actActorParam.h
index 7bbe536d..c0d7346c 100644
--- a/src/KingSystem/ActorSystem/actActorParam.h
+++ b/src/KingSystem/ActorSystem/actActorParam.h
@@ -8,8 +8,8 @@
 #include <thread/seadCriticalSection.h>
 #include "KingSystem/ActorSystem/actBaseProcJob.h"
 #include "KingSystem/Resource/resHandle.h"
-#include "KingSystem/Utils/Thread/Event.h"
 #include "KingSystem/Resource/resResourceActorLink.h"
+#include "KingSystem/Utils/Thread/Event.h"
 
 namespace ksys {
 
@@ -103,8 +103,25 @@ public:
     ActorParam();
     virtual ~ActorParam();
 
+    const sead::SafeString& getActorName() const { return mActorName; }
+    const sead::SafeString& getProfile() const { return mProfile; }
+    const char* getClassName() const { return mClassName; }
+    Priority getPriority() const { return mPriority; }
+    u32 get74() const { return _74; }
+    const Resources& getRes() const { return mRes; }
+
     bool isDummyParam(res::ActorLink::Users::User user) const;
 
+    static void resetDummyResources();
+
+    static Resources sDummyResources;
+
+private:
+    friend class ActorParamMgr;
+
+    void deleteData();
+    void deleteResHandles();
+
     u16 _8 = 0;
     u8 _a = 0;
     sead::FixedSafeString<64> mActorName;
@@ -116,17 +133,6 @@ public:
     std::array<sead::Buffer<res::Handle>, 2> mHandles;
     std::array<s32, 2> mNumHandles;
     u32 _168{};
-
-    static void resetDummyResources();
-
-    static Resources sDummyResources;
-
-private:
-    friend class ActorParamMgr;
-
-    void deleteData();
-    void deleteResHandles();
-
     sead::CriticalSection mCS{nullptr};
     util::Event mEvent{nullptr,
                        sead::IDisposer::HeapNullOption::DoNotAppendDisposerIfNoHeapSpecified, true};