rename _c to lane_id

5 files changed, 10 insertions, 11 deletions

diff --git a/src/KingSystem/Resource/resCache.cpp b/src/KingSystem/Resource/resCache.cpp
index d59ab29e..d3e3195c 100644
--- a/src/KingSystem/Resource/resCache.cpp
+++ b/src/KingSystem/Resource/resCache.cpp
@@ -118,7 +118,7 @@ Handle::Status Cache::loadResource(const ControlTaskData& data) {
     }
 
     u8 lane_id = 0xff;
-    if (data.mResLoadReq._c <= 2) {
+    if (data.mResLoadReq.mLaneId <= 2) {
         const bool x = result->mStatusFlags.isOn(ResourceUnit::StatusFlag::LoadFromArchive);
 #ifdef MATCHING_HACK_NX_CLANG
         // This makes absolutely no sense at all, but this prevents InstCombine from
@@ -127,7 +127,7 @@ Handle::Status Cache::loadResource(const ControlTaskData& data) {
         // so the conditional still works fine.
         __builtin_assume(x);
 #endif
-        lane_id = 2 * data.mResLoadReq._c + (x ? 1 : 2);
+        lane_id = 2 * data.mResLoadReq.mLaneId + (x ? 1 : 2);
     }
 
     ResourceUnit::RequestInitLoadArg load_arg;
diff --git a/src/KingSystem/Resource/resHandle.cpp b/src/KingSystem/Resource/resHandle.cpp
index e47cb65e..c620ee25 100644
--- a/src/KingSystem/Resource/resHandle.cpp
+++ b/src/KingSystem/Resource/resHandle.cpp
@@ -49,9 +49,9 @@ ILoadRequest::~ILoadRequest() {
 
 LoadRequest::LoadRequest() = default;
 
-LoadRequest::LoadRequest(s32 load_data_alignment, u32 arg_c, bool arg_20)
+LoadRequest::LoadRequest(s32 load_data_alignment, u32 lane_id, bool arg_20)
     : _20(arg_20), mLoadDataAlignment(load_data_alignment) {
-    _c = arg_c;
+    mLaneId = lane_id;
 }
 
 SimpleLoadRequest::SimpleLoadRequest() = default;
diff --git a/src/KingSystem/Resource/resInfoContainer.cpp b/src/KingSystem/Resource/resInfoContainer.cpp
index 14795e56..dfecf413 100644
--- a/src/KingSystem/Resource/resInfoContainer.cpp
+++ b/src/KingSystem/Resource/resInfoContainer.cpp
@@ -33,7 +33,7 @@ bool ResourceInfoContainer::loadResourceSizeTable() {
         req._34 = 0;
         req.mRequester = "ResourceInfoContainer";
         req.mPath = "System/Resource/ResourceSizeTable.product.rsizetable";
-        req._c = 1;
+        req.mLaneId = 1;
         return sead::DynamicCast<Resource>(mRstbHandle.load(req.mPath, &req));
     };
 
@@ -48,8 +48,7 @@ bool ResourceInfoContainer::loadResourceSizeTable() {
         const auto num_entries = sead::BitUtil::bitCastPtr<s32>(data, 0x4);
         const auto num_string_entries = sead::BitUtil::bitCastPtr<s32>(data, 0x8);
 
-        auto* entries_data =
-            reinterpret_cast<const ResEntry*>(reinterpret_cast<const u8*>(data) + 0xc);
+        auto* entries_data = reinterpret_cast<const ResEntry*>(data + 0xc);
 
         if (num_entries >= 1) {
             mEntries = {num_entries, entries_data};
@@ -68,7 +67,7 @@ bool ResourceInfoContainer::loadResourceSizeTable() {
         stubbedLogFunction();
         if (resource->getRawSize() != 0) {
             const u32 num_entries = resource->getRawSize() / sizeof(ResEntry);
-            mEntries.setBuffer(num_entries,
+            mEntries.setBuffer(s32(num_entries),
                                reinterpret_cast<const ResEntry*>(resource->getRawData()));
         }
     }
diff --git a/src/KingSystem/Resource/resLoadRequest.h b/src/KingSystem/Resource/resLoadRequest.h
index 13892170..b23f0e55 100644
--- a/src/KingSystem/Resource/resLoadRequest.h
+++ b/src/KingSystem/Resource/resLoadRequest.h
@@ -29,7 +29,7 @@ public:
     virtual ~ILoadRequest();
 
     bool _8 = false;
-    u32 _c = 1;
+    u32 mLaneId = 1;
     sead::SafeString mRequester;
 };
 KSYS_CHECK_SIZE_NX150(ILoadRequest, 0x20);
@@ -38,7 +38,7 @@ class LoadRequest : public ILoadRequest {
     SEAD_RTTI_OVERRIDE(LoadRequest, ILoadRequest)
 public:
     LoadRequest();
-    LoadRequest(s32 load_data_alignment, u32 arg_c, bool arg_20);
+    LoadRequest(s32 load_data_alignment, u32 lane_id, bool arg_20);
     LoadRequest(const LoadRequest&) = default;
     LoadRequest& operator=(const LoadRequest&) = default;
     ~LoadRequest() override = default;
diff --git a/src/KingSystem/Resource/resUnit.cpp b/src/KingSystem/Resource/resUnit.cpp
index ee252d84..186cffb2 100644
--- a/src/KingSystem/Resource/resUnit.cpp
+++ b/src/KingSystem/Resource/resUnit.cpp
@@ -48,7 +48,7 @@ bool ResourceUnit::init(const ResourceUnit::InitArg& arg) {
         SimplePackedLoadRequest request;
         request._8 = true;
         request.mRequester = "ResourceUnit";
-        request._c = 2;
+        request.mLaneId = 2;
         request.mPack = arg.load_req->mPackHandle;
         mArchiveRes = sead::DynamicCast<sead::ArchiveRes>(mArchiveResHandle.load("", &request));
     }