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

Load ui_sdk.rpak upon init

Browse Source 
Load ui_sdk.rpak after ui_mp.rpak.
Moved the loading of common_sdk.rpak to after common_sp.rpak/common_mp.rpak.
This should allow overriding existing assets.
This commit is contained in:
Kawe Mazidjatari 2022-05-26 02:58:46 +02:00
parent c406147261
commit 7833eb9b1d
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
r5dev/engine/cmodel_bsp.cpp
View File

@ -249,12 +249,6 @@ void MOD_ProcessPakQueue()
return; return;
} }
} }
if (strcmp(v17, "common_sp.rpak") == 0 || strcmp(v17, "common_mp.rpak") == 0)
{
RPakHandle_t pakId = g_pakLoadApi->AsyncLoad("common_sdk.rpak");
if (pakId != -1)
g_LoadedPakHandle.push_back(pakId);
}
if (strcmp(v17, "mp_lobby.rpak") == 0) if (strcmp(v17, "mp_lobby.rpak") == 0)
s_bBasePaksInitialized = true; s_bBasePaksInitialized = true;
@ -263,9 +257,21 @@ void MOD_ProcessPakQueue()
s_bLevelResourceInitialized = true; s_bLevelResourceInitialized = true;
MOD_PreloadPakFile(g_svLevelName); MOD_PreloadPakFile(g_svLevelName);
} }
*(_DWORD*)v15 = g_pakLoadApi->AsyncLoad(v17, g_pMallocPool.GetPtr(), 4, 0); *(_DWORD*)v15 = g_pakLoadApi->AsyncLoad(v17, g_pMallocPool.GetPtr(), 4, 0);
if (strcmp(v17, "common_mp.rpak") == 0 || strcmp(v17, "common_sp.rpak") == 0 || strcmp(v17, "common_pve.rpak") == 0)
{
RPakHandle_t pakHandle = g_pakLoadApi->AsyncLoad("common_sdk.rpak", g_pMallocPool.GetPtr(), 4, 0);
if (pakHandle != -1)
g_LoadedPakHandle.push_back(pakHandle);
}
if (strcmp(v17, "ui_mp.rpak") == 0)
{
RPakHandle_t pakHandle = g_pakLoadApi->AsyncLoad("ui_sdk.rpak", g_pMallocPool.GetPtr(), 4, 0);
if (pakHandle != -1)
g_LoadedPakHandle.push_back(pakHandle);
}
LABEL_37: LABEL_37:
v21 = *(_DWORD*)v15; v21 = *(_DWORD*)v15;
if (*(_DWORD*)v15 != -1) if (*(_DWORD*)v15 != -1)