From c3fb9671b29c8e414342678dbf1c10d9513eade9 Mon Sep 17 00:00:00 2001
From: TheApadayo <muel96@gmail.com>
Date: Sun, 29 Jan 2017 12:27:11 -0500
Subject: [PATCH] [DLC] Added better handling for users who don't have dlc maps
 installed when launching from the server list

---
 src/Components/Modules/Maps.cpp       | 37 +++++++++++++++++++++------
 src/Components/Modules/Maps.hpp       |  3 +++
 src/Components/Modules/ServerList.cpp |  5 ++++
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/Components/Modules/Maps.cpp b/src/Components/Modules/Maps.cpp
index 0cea2fb8..9cc7b890 100644
--- a/src/Components/Modules/Maps.cpp
+++ b/src/Components/Modules/Maps.cpp
@@ -498,20 +498,41 @@ namespace Components
 		Utils::Hook::Set<Game::XAssetEntry*>(0x5BAEA2, Maps::EntryPool.data() + 1);
 	}
 
+	bool Maps::CheckMapInstalled(const char* mapname, bool error)
+	{
+		if (FastFiles::Exists(mapname)) return true;
+		if (!error) return false;
+
+		for (auto& pack : Maps::DlcPacks)
+		{
+			for (auto map : pack.maps)
+			{
+				if (map == std::string(mapname))
+				{
+					if(error) Components::Logger::SoftError("Missing DLC pack %s (%d) containing map %s (%s).\nPlease download it to play this map.", 
+						pack.name.data(), pack.index, Game::UI_LocalizeMapName(mapname), mapname);
+				}
+			}
+		}
+
+		if (error) Components::Logger::SoftError("Missing map file %s.\nYou may have a damaged installation or are attempting to load a non-existant map.", mapname);
+		return false;
+	}
+
 	Maps::Maps()
 	{
 		Dvar::OnInit([] ()
 		{
 			Dvar::Register<bool>("isDlcInstalled_All", false, Game::DVAR_FLAG_USERCREATED | Game::DVAR_FLAG_WRITEPROTECTED, "");
 
-			Maps::AddDlc({ 1, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_complex", "mp_compact", "mp_storm", "mp_overgrown", "mp_crash" } });
-			Maps::AddDlc({ 2, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_abandon", "mp_vacant", "mp_trailerpark", "mp_strike", "mp_fuel2" } });
-			Maps::AddDlc({ 3, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_nuked" } });
-			Maps::AddDlc({ 4, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_cross_fire", "mp_cargoship", "mp_bloc" } });
-			Maps::AddDlc({ 5, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_killhouse", "mp_bog_sh" } });
-			Maps::AddDlc({ 6, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_cargoship_sh" } });
-			Maps::AddDlc({ 7, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_shipment_long", "mp_rust_long", "mp_firingrange" } });
-			Maps::AddDlc({ 8, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_bloc_sh", "mp_crash_tropical", "mp_estate_tropical", "mp_fav_tropical", "mp_storm_spring" } });
+			Maps::AddDlc({ 1, "Stimulus Pack", Utils::Cache::GetStaticUrl("/dlc/"), { "mp_complex", "mp_compact", "mp_storm", "mp_overgrown", "mp_crash" } });
+			Maps::AddDlc({ 2, "Resergence Pack", Utils::Cache::GetStaticUrl("/dlc/"), { "mp_abandon", "mp_vacant", "mp_trailerpark", "mp_strike", "mp_fuel2" } });
+			Maps::AddDlc({ 3, "Nuketown", Utils::Cache::GetStaticUrl("/dlc/"), { "mp_nuked" } });
+			Maps::AddDlc({ 4, "Classics Pack", Utils::Cache::GetStaticUrl("/dlc/"), { "mp_cross_fire", "mp_cargoship", "mp_bloc" } });
+			Maps::AddDlc({ 5, "Classics Pack", Utils::Cache::GetStaticUrl("/dlc/"), { "mp_killhouse", "mp_bog_sh" } });
+			Maps::AddDlc({ 6, "Freighter", Utils::Cache::GetStaticUrl("/dlc/"), { "mp_cargoship_sh" } });
+			Maps::AddDlc({ 7, "Resurrection Pack", Utils::Cache::GetStaticUrl("/dlc/"), { "mp_shipment_long", "mp_rust_long", "mp_firingrange" } });
+			Maps::AddDlc({ 8, "Recycled Pack", Utils::Cache::GetStaticUrl("/dlc/"), { "mp_bloc_sh", "mp_crash_tropical", "mp_estate_tropical", "mp_fav_tropical", "mp_storm_spring" } });
 
 			Maps::UpdateDlcStatus();
 
diff --git a/src/Components/Modules/Maps.hpp b/src/Components/Modules/Maps.hpp
index 4cd45e7a..f387da65 100644
--- a/src/Components/Modules/Maps.hpp
+++ b/src/Components/Modules/Maps.hpp
@@ -20,11 +20,14 @@ namespace Components
 
 		static std::string CurrentMainZone;
 
+		static bool CheckMapInstalled(const char* mapname, bool error = false);
+
 	private:
 		class DLC
 		{
 		public:
 			int index;
+			std::string name;
 			std::string url;
 			std::vector<std::string> maps;
 		};
diff --git a/src/Components/Modules/ServerList.cpp b/src/Components/Modules/ServerList.cpp
index cc30c1b4..73abbc51 100644
--- a/src/Components/Modules/ServerList.cpp
+++ b/src/Components/Modules/ServerList.cpp
@@ -89,6 +89,10 @@ namespace Components
 			{
 				if (server->svRunning)
 				{
+					if (!Maps::CheckMapInstalled(server->mapname.data()))
+					{
+						return Utils::String::VA("^1%s", Game::UI_LocalizeMapName(server->mapname.data()));
+					}
 					return Game::UI_LocalizeMapName(server->mapname.data());
 				}
 				else
@@ -711,6 +715,7 @@ namespace Components
 
 			if (info)
 			{
+				if (!Maps::CheckMapInstalled(info->mapname.data(), true)) return;
 				Party::Connect(info->addr);
 			}
 		});