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 edge case bug where level hasn't changed while it did

Browse Source 
Fix bug where  'Mod_LevelHasChanged(...)' returns false even though it had changed. The static var was set in a different function which worked with the old system. The static var is now set within 'Mod_GetLevelSettings()', if 'Mod_LevelHasChanged()' returns true.
This commit is contained in:
Kawe Mazidjatari 2022-11-24 15:47:14 +01:00
parent 634184eb56
commit 734e24b355
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
r5dev/engine/cmodel_bsp.cpp
View File

@ -362,7 +362,6 @@ bool Mod_LoadPakForMap(const char* szLevelName)
if (Mod_LevelHasChanged(szLevelName))
s_bLevelResourceInitialized = false;
s_svLevelName = szLevelName;
return v_Mod_LoadPakForMap(szLevelName);
}
@ -376,9 +375,7 @@ KeyValues* Mod_GetLevelSettings(const char* pszLevelName)
if (s_pLevelSetKV)
{
if (!Mod_LevelHasChanged(pszLevelName))
{
return s_pLevelSetKV;
}
s_pLevelSetKV->DeleteThis();
}
@ -386,7 +383,9 @@ KeyValues* Mod_GetLevelSettings(const char* pszLevelName)
char szPathBuffer[MAX_PATH];
snprintf(szPathBuffer, sizeof(szPathBuffer), "scripts/levels/settings/%s.kv", pszLevelName);
s_svLevelName = pszLevelName;
s_pLevelSetKV = FileSystem()->LoadKeyValues(IFileSystem::TYPE_LEVELSETTINGS, szPathBuffer, "GAME");
return s_pLevelSetKV;
}