From 1c36dfa48451f49199096bec5f93b4bd264e9624 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sun, 17 Nov 2024 02:01:51 +0100 Subject: [PATCH] RTech: rename member variables The streaming asset counter only counts for optional assets. PakMemoryData_s::guidDescriptors should also be pageDescriptors. --- src/public/rtech/ipakfile.h | 6 +++--- src/rtech/pak/pakstream.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/public/rtech/ipakfile.h b/src/public/rtech/ipakfile.h index 72ff9ec3..39511a68 100644 --- a/src/public/rtech/ipakfile.h +++ b/src/public/rtech/ipakfile.h @@ -351,8 +351,8 @@ struct PakGlobalState_s b64 emulateStreamingInstallInit; b64 emulateStreamingInstall; - // mounted # streamable assets (globally across all paks) - int64_t numStreamableAssets; + // mounted # optional streamable assets (globally across all paks) + int64_t numOptStreamableAssets; b64 hasPendingUnloadJobs; // paks that contain tracked assets @@ -693,7 +693,7 @@ struct PakMemoryData_s PakPage_u* virtualPointers; PakAsset_s* assetEntries; - PakPage_u* guidDescriptors; + PakPage_u* pageDescriptors; uint32_t* fileRelations; char gap5E0[32]; diff --git a/src/rtech/pak/pakstream.h b/src/rtech/pak/pakstream.h index 5b3e2bc4..21a30cde 100644 --- a/src/rtech/pak/pakstream.h +++ b/src/rtech/pak/pakstream.h @@ -13,10 +13,10 @@ extern void Pak_LoadStreamingData(PakLoadedInfo_s* const loadedInfo); inline float* g_pStreamingDownloadProgress = nullptr; // NOTE: must use these when incrementing asset counts !!! -inline void Pak_IncrementStreamingAssetCount() { ThreadInterlockedIncrement64(&g_pakGlobals->numStreamableAssets); } -inline void Pak_DecrementStreamingAssetCount() { ThreadInterlockedDecrement64(&g_pakGlobals->numStreamableAssets); } +inline void Pak_IncrementStreamingAssetCount() { ThreadInterlockedIncrement64(&g_pakGlobals->numOptStreamableAssets); } +inline void Pak_DecrementStreamingAssetCount() { ThreadInterlockedDecrement64(&g_pakGlobals->numOptStreamableAssets); } -inline int64_t Pak_GetNumStreamableAssets() { return g_pakGlobals->numStreamableAssets; } +inline int64_t Pak_GetNumStreamableAssets() { return g_pakGlobals->numOptStreamableAssets; } inline float Pak_GetStreamingDownloadProgress() { return *g_pStreamingDownloadProgress; } inline bool Pak_StreamingDownloadFinished() { return Pak_GetStreamingDownloadProgress() == 1.0f; }