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

Remove hardcoded map names

Browse Source 
We are not hardcoding them
This commit is contained in:
Kawe Mazidjatari 2022-05-04 12:55:00 +02:00
parent 325fee107b
commit ad08685e9b
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
r5dev/gameui/IBrowser.cpp
View File

@ -49,15 +49,7 @@ IBrowser::IBrowser(void)
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);
auto it = mapArray.find(filename); // Find MapName in mapArray.
if (it != mapArray.end())
{
m_vszMapsList.push_back(it->second);
}
else
{
m_vszMapsList.push_back(filename);
}
m_vszMapsList.push_back(filename);
m_vszMapFileNameList.push_back(filename);
}
@ -442,13 +434,6 @@ void IBrowser::HostServerSection(void)
if (ImGui::Selectable(item.c_str(), item == m_Server.svMapName))
{
m_Server.svMapName = item;
for (auto it = mapArray.begin(); it != mapArray.end(); ++it)
{
if (it->second.compare(m_Server.svMapName) == NULL)
{
m_Server.svMapName = it->first;
}
}
}
}
ImGui::EndCombo();

11
r5dev/gameui/IBrowser.h
View File

@ -82,17 +82,6 @@ public:
char m_chServerEncKeyBuffer[30] = { 0 };
std::string m_szServerListMessage = std::string();
std::map<std::string, std::string> mapArray =
{
{ "mp_rr_canyonlands_64k_x_64k", "King's Canyon Season 0" },
{ "mp_rr_desertlands_64k_x_64k", "World's Edge Season 3" },
{ "mp_rr_canyonlands_mu1", "King's Canyon Season 2" },
{ "mp_rr_canyonlands_mu1_night", "King's Canyon Season 2 After Dark" },
{ "mp_rr_desertlands_64k_x_64k_nx", "World's Edge Season 3 After Dark" },
{ "mp_lobby", "Lobby Season 3" },
{ "mp_rr_canyonlands_staging", "King's Canyon Firing Range" }
};
////////////////////
// Settings //
////////////////////

2
r5dev/networksystem/serverlisting.h
View File

@ -3,7 +3,7 @@
struct ServerListing
{
std::string svServerName;
std::string svMapName = "mp_rr_canyonlands_staging";
std::string svMapName = "mp_lobby";
std::string svIpAddress;
std::string svPort;
std::string svPlaylist = "dev_default";