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

Cleanup 'Mod_GetAllInstalledMaps'

Browse Source 
Light cleanup
This commit is contained in:
Kawe Mazidjatari 2023-04-03 18:38:36 +02:00
parent 32d04645ca
commit b8d97d0d1c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
r5dev/engine/cmodel_bsp.cpp
View File

@ -44,29 +44,29 @@ void Mod_GetAllInstalledMaps()
std::lock_guard<std::mutex> l(g_InstalledMapsMutex); std::lock_guard<std::mutex> l(g_InstalledMapsMutex);
g_InstalledMaps.clear(); // Clear current list. g_InstalledMaps.clear(); // Clear current list.
fs::directory_iterator fsDir("vpk"); fs::directory_iterator directoryIterator("vpk");
std::regex rgArchiveRegex{ R"([^_]*_(.*)(.bsp.pak000_dir).*)" }; std::regex archiveRegex{ R"([^_]*_(.*)(.bsp.pak000_dir).*)" };
std::smatch smRegexMatches; std::smatch regexMatches;
for (const fs::directory_entry& dEntry : fsDir) for (const fs::directory_entry& directoryEntry : directoryIterator)
{ {
std::string svFileName = dEntry.path().u8string(); std::string fileName = directoryEntry.path().u8string();
std::regex_search(svFileName, smRegexMatches, rgArchiveRegex); std::regex_search(fileName, regexMatches, archiveRegex);
if (!smRegexMatches.empty()) if (!regexMatches.empty())
{ {
if (smRegexMatches[1].str().compare("frontend") == 0) if (regexMatches[1].str().compare("frontend") == 0)
continue; // Frontend contains no BSP's. continue; // Frontend contains no BSP's.
else if (smRegexMatches[1].str().compare("mp_common") == 0) else if (regexMatches[1].str().compare("mp_common") == 0)
{ {
if (std::find(g_InstalledMaps.begin(), g_InstalledMaps.end(), "mp_lobby") == g_InstalledMaps.end()) if (std::find(g_InstalledMaps.begin(), g_InstalledMaps.end(), "mp_lobby") == g_InstalledMaps.end())
g_InstalledMaps.push_back("mp_lobby"); g_InstalledMaps.push_back("mp_lobby");
continue; // Common contains mp_lobby. continue; // Common contains mp_lobby.
} }
if (std::find(g_InstalledMaps.begin(), g_InstalledMaps.end(), smRegexMatches[1].str()) == g_InstalledMaps.end()) if (std::find(g_InstalledMaps.begin(), g_InstalledMaps.end(), regexMatches[1].str()) == g_InstalledMaps.end())
g_InstalledMaps.push_back(smRegexMatches[1].str()); g_InstalledMaps.push_back(regexMatches[1].str());
} }
} }
} }