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

Engine: fix level pak unloading crash

Browse Source 
Changing the load/unload system to FILO caused a crash when loading 3 level paks, either through request load or level settings, and then unloading them in reverse order. This is a regression caused when the pak loading and unloading system was reworked. Changing the system back to FIFO fixes the issue.
This commit is contained in:
Kawe Mazidjatari 2024-10-07 11:07:06 +02:00
parent ab0672126d
commit e925f4cb6e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/engine/cmodel_bsp.cpp
View File

@ -59,9 +59,12 @@ PakHandle_t CustomPakData_t::LoadAndAddPak(const char* const pakFile)
//-----------------------------------------------------------------------------
void CustomPakData_t::UnloadAndRemoveAll()
{
for (; numHandles-1 >= CustomPakData_t::PAK_TYPE_COUNT; numHandles--)
// Base SDK paks should not be unloaded here, but only right before base
// engine paks are unloaded. Only unload user requested and level settings
// paks from here.
for (size_t i = CustomPakData_t::PAK_TYPE_COUNT; i < numHandles; i++)
{
const PakHandle_t pakId = handles[numHandles-1];
const PakHandle_t pakId = handles[i];
if (pakId == PAK_INVALID_HANDLE)
{
@ -70,7 +73,7 @@ void CustomPakData_t::UnloadAndRemoveAll()
}
g_pakLoadApi->UnloadAsync(pakId);
handles[numHandles-1] = PAK_INVALID_HANDLE;
handles[i] = PAK_INVALID_HANDLE;
}
}