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

Parse/reparse map list on playlists file initialization.

Browse Source 
Map list will now initialize with the playlist. User could also reparse the map list by reparsing the playlists file.
This commit is contained in:
Kawe Mazidjatari 2022-11-06 14:21:27 +01:00
parent dc8ad3dd53
commit 7a065ccd12
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/engine/cmodel_bsp.cpp
View File

@ -36,9 +36,7 @@ bool MOD_LevelHasChanged(const string& svLevelName)
void MOD_GetAllInstalledMaps()
{
std::lock_guard<std::mutex> l(g_MapVecMutex);
if (!g_vAllMaps.empty())
return;
g_vAllMaps.clear(); // Clear current list.
std::regex rgArchiveRegex{ R"([^_]*_(.*)(.bsp.pak000_dir).*)" };
std::smatch smRegexMatches;
@ -51,13 +49,13 @@ void MOD_GetAllInstalledMaps()
if (!smRegexMatches.empty())
{
if (smRegexMatches[1].str().compare("frontend") == 0)
continue;
continue; // Frontend contains no BSP's.
else if (smRegexMatches[1].str().compare("mp_common") == 0)
{
if (std::find(g_vAllMaps.begin(), g_vAllMaps.end(), "mp_lobby") == g_vAllMaps.end())
g_vAllMaps.push_back("mp_lobby");
continue;
continue; // Common contains mp_lobby.
}
if (std::find(g_vAllMaps.begin(), g_vAllMaps.end(), smRegexMatches[1].str()) == g_vAllMaps.end())

6
r5dev/filesystem/basefilesystem.cpp
View File

@ -119,11 +119,11 @@ VPKData_t* CBaseFileSystem::VMountVPKFile(CBaseFileSystem* pFileSystem, const ch
if (nHandle < 0 && pPakData) // Only log if VPK hasn't been mounted yet and we have a valid pointer.
{
::DevMsg(eDLL_T::FS, "Mounted VPK file: '%s' with handle: '%i'\n", pszVpkPath, pPakData->m_nHandle);
::DevMsg(eDLL_T::FS, "Mounted vpk file: '%s' with handle: '%i'\n", pszVpkPath, pPakData->m_nHandle);
}
else if (!pPakData) // VPK failed to load or does not exist...
{
::Warning(eDLL_T::FS, "Unable to mount VPK file: '%s'\n", pszVpkPath);
::Warning(eDLL_T::FS, "Unable to mount vpk file: '%s'\n", pszVpkPath);
}
return pPakData;
@ -142,7 +142,7 @@ const char* CBaseFileSystem::VUnmountVPKFile(CBaseFileSystem* pFileSystem, const
if (nHandle >= 0)
{
::DevMsg(eDLL_T::FS, "Unmounted VPK file: '%s' with handle: '%i'\n", pszVpkPath, nHandle);
::DevMsg(eDLL_T::FS, "Unmounted vpk file: '%s' with handle: '%i'\n", pszVpkPath, nHandle);
}
return pRet;

1
r5dev/launcher/IApplication.cpp
View File

@ -32,7 +32,6 @@ int CModAppSystemGroup::Main(CModAppSystemGroup* pModAppSystemGroup)
{
int nRunResult = RUN_OK;
HEbisuSDK_Init(); // Not here in retail. We init EbisuSDK here though.
MOD_GetAllInstalledMaps();
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1) // !TODO: rebuild does not work for S1 (CModAppSystemGroup and CEngine member offsets do align with all other builds).
return CModAppSystemGroup_Main(pModAppSystemGroup);

2
r5dev/vpc/keyvalues.cpp
View File

@ -15,6 +15,7 @@
#include "mathlib/color.h"
#include "rtech/stryder/stryder.h"
#include "engine/sys_dll2.h"
#include "engine/cmodel_bsp.h"
//-----------------------------------------------------------------------------
// Purpose: Constructor
@ -1231,6 +1232,7 @@ void KeyValues::InitPlaylists(void)
}
}
}
MOD_GetAllInstalledMaps(); // Parse all installed maps.
}
//-----------------------------------------------------------------------------