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

fix external bsp_lump loading

Browse Source 
previously the lump data was being freed immediately after loading. this sets m_pRawData to nullptr so that doesn't happen
This commit is contained in:
rexx 2023-05-20 13:49:12 +01:00
parent 4297cd9ce3
commit d7f0de9d40
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
r5dev/engine/modelloader.cpp
View File

@ -184,11 +184,14 @@ void CMapLoadHelper::Constructor(CMapLoadHelper* loader, int lumpToLoad)
{
FileHandle_t hLumpFile = FileSystem()->Open(pathBuf, "rb");
loader->m_pData = loader->m_pRawData;
if (hLumpFile != FILESYSTEM_INVALID_HANDLE)
{
FileSystem()->ReadEx(loader->m_pRawData, bytesToRead, bytesToRead, hLumpFile);
FileSystem()->Close(hLumpFile);
loader->m_pRawData = nullptr;
loader->m_bExternal = true;
}
else // Seek to offset in packed BSP file to load the lump.
@ -196,8 +199,6 @@ void CMapLoadHelper::Constructor(CMapLoadHelper* loader, int lumpToLoad)
FileSystem()->Seek(mapFileHandle, loader->m_nLumpOffset, FILESYSTEM_SEEK_HEAD);
FileSystem()->ReadEx(loader->m_pRawData, bytesToRead, bytesToRead, mapFileHandle);
}
loader->m_pData = loader->m_pRawData;
}
}
}