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 missing valid external lump check

Browse Source 
bsp_lump loading was missing a check for if the lump is supposed to be able to load from disk

also removes VERTEX lumps from loading from disk due to crashes that occur when they are kept
This commit is contained in:
rexx 2023-05-20 14:54:00 +01:00
parent d7f0de9d40
commit 66f52dea23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
r5dev/engine/modelloader.cpp
View File

@ -37,10 +37,10 @@ bool IsLumpIdxValid(int lumpType)
case LUMP_UNKNOWN_37:
case LUMP_UNKNOWN_38:
case LUMP_UNKNOWN_39:
case LUMP_VERTEX_UNLIT:
case LUMP_VERTEX_LIT_FLAT:
case LUMP_VERTEX_LIT_BUMP:
case LUMP_VERTEX_UNLIT_TS:
//case LUMP_VERTEX_UNLIT:
//case LUMP_VERTEX_LIT_FLAT:
//case LUMP_VERTEX_LIT_BUMP:
//case LUMP_VERTEX_UNLIT_TS:
case LUMP_MESH_INDICES:
case LUMP_LIGHTMAP_DATA_SKY:
case LUMP_CSM_AABB_NODES:
@ -182,12 +182,12 @@ void CMapLoadHelper::Constructor(CMapLoadHelper* loader, int lumpToLoad)
if (loader->m_nLumpSize)
{
FileHandle_t hLumpFile = FileSystem()->Open(pathBuf, "rb");
loader->m_pData = loader->m_pRawData;
if (hLumpFile != FILESYSTEM_INVALID_HANDLE)
FileHandle_t hLumpFile;
if (IsLumpIdxValid(lumpToLoad) && (hLumpFile = FileSystem()->Open(pathBuf, "rb"), hLumpFile != FILESYSTEM_INVALID_HANDLE))
{
//DevMsg(eDLL_T::ENGINE, "Loading lump %.4x from file. Buffer: %p\n", lumpToLoad, loader->m_pRawData);
FileSystem()->ReadEx(loader->m_pRawData, bytesToRead, bytesToRead, hLumpFile);
FileSystem()->Close(hLumpFile);