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

Get all available maps from VPK instead

Browse Source 
Before we used the stbsp's, but we don't need to copy these for each maps (we could load existing ones to get working texture streaming for maps that don't have this)
This commit is contained in:
Kawe Mazidjatari 2022-05-04 17:36:23 +02:00
parent ad08685e9b
commit 93f634022a
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
r5dev/gameui/IBrowser.cpp
View File

@ -41,16 +41,28 @@ IBrowser::IBrowser(void)
{
memset(m_chServerConnStringBuffer, 0, sizeof(m_chServerConnStringBuffer));
std::string path = "stbsp";
for (const auto& entry : std::filesystem::directory_iterator(path))
{
std::string filename = entry.path().string();
int slashPos = filename.rfind("\\", std::string::npos);
filename = filename.substr(static_cast<std::basic_string<char, std::char_traits<char>, std::allocator<char>>::size_type>(slashPos) + 1, std::string::npos);
filename = filename.substr(0, filename.size() - 6);
std::regex rgArchiveRegex{ R"([^_]*_(.*)(.bsp.pak000_dir).*)" };
std::smatch smRegexMatches;
m_vszMapsList.push_back(filename);
m_vszMapFileNameList.push_back(filename);
for (const auto& dEntry : std::filesystem::directory_iterator("vpk"))
{
std::string svFileName = dEntry.path().string();
std::regex_search(svFileName, smRegexMatches, rgArchiveRegex);
if (smRegexMatches.size() > 0)
{
if (strcmp(smRegexMatches[1].str().c_str(), "frontend") == 0)
{
continue;
}
else if (strcmp(smRegexMatches[1].str().c_str(), "mp_common") == 0)
{
m_vszMapsList.push_back("mp_lobby");
continue;
}
m_vszMapsList.push_back(smRegexMatches[1].str());
}
}
#ifndef CLIENT_DLL

1
r5dev/gameui/IBrowser.h
View File

@ -92,7 +92,6 @@ public:
////////////////////
ServerListing m_Server;
std::vector<std::string> m_vszMapsList;
std::vector<std::string> m_vszMapFileNameList;
std::string m_szHostRequestMessage = "";
std::string m_szHostToken = "";
ImVec4 m_iv4HostRequestMessageColor = ImVec4(1.00f, 1.00f, 1.00f, 1.00f);

2
r5dev/squirrel/sqinit.cpp
View File

@ -296,7 +296,7 @@ namespace VSquirrel
//-----------------------------------------------------------------------------
SQRESULT GetAvailableMaps(HSQUIRRELVM v)
{
std::vector<std::string> vsvMapList = g_pIBrowser->m_vszMapFileNameList;
std::vector<std::string> vsvMapList = g_pIBrowser->m_vszMapsList;
if (vsvMapList.empty())
{