R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

RTech: rename member variables

Browse Source 
The streaming asset counter only counts for optional assets. PakMemoryData_s::guidDescriptors should also be pageDescriptors.
This commit is contained in:
Kawe Mazidjatari 2024-11-17 02:01:51 +01:00
parent 3d56934cc0
commit 1c36dfa484
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/rtech/ipakfile.h
View File

@ -351,8 +351,8 @@ struct PakGlobalState_s
b64 emulateStreamingInstallInit; b64 emulateStreamingInstallInit;
b64 emulateStreamingInstall; b64 emulateStreamingInstall;
// mounted # streamable assets (globally across all paks) // mounted # optional streamable assets (globally across all paks)
int64_t numStreamableAssets; int64_t numOptStreamableAssets;
b64 hasPendingUnloadJobs; b64 hasPendingUnloadJobs;
// paks that contain tracked assets // paks that contain tracked assets
@ -693,7 +693,7 @@ struct PakMemoryData_s
PakPage_u* virtualPointers; PakPage_u* virtualPointers;
PakAsset_s* assetEntries; PakAsset_s* assetEntries;
PakPage_u* guidDescriptors; PakPage_u* pageDescriptors;
uint32_t* fileRelations; uint32_t* fileRelations;
char gap5E0[32]; char gap5E0[32];

6
src/rtech/pak/pakstream.h
View File

@ -13,10 +13,10 @@ extern void Pak_LoadStreamingData(PakLoadedInfo_s* const loadedInfo);
inline float* g_pStreamingDownloadProgress = nullptr; inline float* g_pStreamingDownloadProgress = nullptr;
// NOTE: must use these when incrementing asset counts !!! // NOTE: must use these when incrementing asset counts !!!
inline void Pak_IncrementStreamingAssetCount() { ThreadInterlockedIncrement64(&g_pakGlobals->numStreamableAssets); } inline void Pak_IncrementStreamingAssetCount() { ThreadInterlockedIncrement64(&g_pakGlobals->numOptStreamableAssets); }
inline void Pak_DecrementStreamingAssetCount() { ThreadInterlockedDecrement64(&g_pakGlobals->numStreamableAssets); } 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 float Pak_GetStreamingDownloadProgress() { return *g_pStreamingDownloadProgress; }
inline bool Pak_StreamingDownloadFinished() { return Pak_GetStreamingDownloadProgress() == 1.0f; } inline bool Pak_StreamingDownloadFinished() { return Pak_GetStreamingDownloadProgress() == 1.0f; }