From ad08685e9bed33ef3056df3f9b9443aaef006fe1 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Wed, 4 May 2022 12:55:00 +0200
Subject: [PATCH] Remove hardcoded map names

We are not hardcoding them
---
 r5dev/gameui/IBrowser.cpp           | 17 +----------------
 r5dev/gameui/IBrowser.h             | 11 -----------
 r5dev/networksystem/serverlisting.h |  2 +-
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/r5dev/gameui/IBrowser.cpp b/r5dev/gameui/IBrowser.cpp
index bb33cb4c..81ae570e 100644
--- a/r5dev/gameui/IBrowser.cpp
+++ b/r5dev/gameui/IBrowser.cpp
@@ -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();
diff --git a/r5dev/gameui/IBrowser.h b/r5dev/gameui/IBrowser.h
index 0e28ba2e..75cceb0c 100644
--- a/r5dev/gameui/IBrowser.h
+++ b/r5dev/gameui/IBrowser.h
@@ -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    //
     ////////////////////
diff --git a/r5dev/networksystem/serverlisting.h b/r5dev/networksystem/serverlisting.h
index 31a686ad..1d29b2d7 100644
--- a/r5dev/networksystem/serverlisting.h
+++ b/r5dev/networksystem/serverlisting.h
@@ -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";