rename _c to lane_id

1 files changed, 12 insertions, 14 deletions

diff --git a/src/KingSystem/ActorSystem/actActorParamMgr.h b/src/KingSystem/ActorSystem/actActorParamMgr.h
index 3704dce3..8f69b9b3 100644
--- a/src/KingSystem/ActorSystem/actActorParamMgr.h
+++ b/src/KingSystem/ActorSystem/actActorParamMgr.h
@@ -42,19 +42,17 @@ public:
 
     ActorParam* allocParam(const char* actor_name, bool* allocated_new);
     ActorParam* getParam(const char* actor_name, ActorParam** out_free_param) const;
-    ActorParam* loadParam(const char* actor_name, res::Handle* pack_handle, void* x,
-                          u32 load_req_c);
+    ActorParam* loadParam(const char* actor_name, res::Handle* pack_handle, void* x, u32 lane_id);
     void unloadParam(ActorParam* param);
 
-    bool requestLoadActorPack(res::Handle* handle, const sead::SafeString& actor_name,
-                              u32 load_req_c);
+    bool requestLoadActorPack(res::Handle* handle, const sead::SafeString& actor_name, u32 lane_id);
 
     ActorParam* loadParamAsync(const char* actor_name, res::Handle* pack_handle,
-                               bool* allocated_new, void* x, u32 load_req_c);
+                               bool* allocated_new, void* x, u32 lane_id);
     bool finishLoadingActorLink(ActorParam* param, void* x);
-    void loadParamAsyncStep2(ActorParam* param, res::Handle* pack_handle, void* x, u32 load_req_c);
+    void loadParamAsyncStep2(ActorParam* param, res::Handle* pack_handle, void* x, u32 lane_id);
     bool finishLoadingStep2(ActorParam* param, void* x);
-    void loadExtraResAsync(ActorParam* param, res::Handle* pack_handle, void* x, u32 load_req_c);
+    void loadExtraResAsync(ActorParam* param, res::Handle* pack_handle, void* x, u32 lane_id);
     bool finishLoadingExtraRes(ActorParam* param, void* x);
     res::GParamList* getDummyGParamList() const;
 
@@ -67,31 +65,31 @@ private:
     };
 
     void loadFiles(ActorParam* param, sead::Heap* heap, res::Handle* pack_handle, void* x,
-                   u32 load_req_c);
+                   u32 lane_id);
     bool prepareLoadFromActorPack(sead::BufferedSafeString* path, res::LoadRequest* req, void* x,
                                   const sead::SafeString& dir_name,
                                   const sead::SafeString& extension,
                                   const sead::SafeString& file_name, res::Handle* pack_handle,
-                                  u32 load_req_c, const sead::SafeString& requester);
+                                  u32 lane_id, const sead::SafeString& requester);
     res::Archive* loadActorPack(res::Handle* handle, const sead::SafeString& actor_name,
-                                u32 load_req_c);
+                                u32 lane_id);
 
     template <typename T>
     T* loadFile(ActorParam* param, ActorParam::ResourceType type, const char* dir_name_c,
                 const char* extension_c, const char* name_c, res::Handle* pack_handle, void* x,
-                u32 load_req_c);
+                u32 lane_id);
 
     template <typename T>
     bool loadFileAsync(ActorParam* param, ActorParam::ResourceType type,
                        const sead::SafeString& dir_name, const sead::SafeString& extension,
                        const sead::SafeString& name, res::Handle* pack_handle, void* x,
-                       u32 load_req_c);
+                       u32 lane_id);
 
     template <typename T>
     T* handleAsyncFileLoad(ActorParam* param, s32* idx, ActorParam::ResourceType type, void* x);
 
     void loadFilesStep2(ActorParam* param, sead::Heap* heap, res::Handle* pack_handle, void* x,
-                        u32 load_req_c);
+                        u32 lane_id);
 
     void allocExtraResHandles(ActorParam* param, sead::Heap* heap) const;
 
@@ -101,7 +99,7 @@ private:
 
     static constexpr s32 NumParams = 0x400;
 
-    sead::TypedBitFlag<Flag> mFlags{};
+    sead::TypedBitFlag<Flag> mFlags;
     ActorParam* mParams = nullptr;
     DebugMessage mDebugMessage{"アクタパラメータ"};
     void* _e0 = nullptr;