From 53ddbadefae73545efee4ab1a0f5e212d6684224 Mon Sep 17 00:00:00 2001
From: Lucas de Vries <lucasdevries@gmail.com>
Date: Tue, 17 Jul 2018 16:27:10 +0200
Subject: [PATCH] Remove updater from main menu, unlock woth by default.

---
 scripts/menu/main_menu.as           |  5 ++---
 source/game/main/initialization.cpp | 21 +++++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/scripts/menu/main_menu.as b/scripts/menu/main_menu.as
index ccf6fdb..c36d1ac 100644
--- a/scripts/menu/main_menu.as
+++ b/scripts/menu/main_menu.as
@@ -28,7 +28,6 @@ enum MenuActions {
 	MA_Mods,
 };
 
-class MainMenu : MenuBox {
 	MenuNews news;
 
 	MainMenu() {
@@ -61,8 +60,8 @@ class MainMenu : MenuBox {
 		if(game_running && !mpClient)
 			items.addItem(MenuAction(Sprite(spritesheet::MenuIcons, 2), locale::SAVE_GAME, MA_SaveGame));
 		items.addItem(MenuAction(Sprite(spritesheet::ResourceIconsSmall, 46), locale::MODS_MENU, MA_Mods));
-		if(!game_running && !STEAM_EQUIV_BUILD)
-			items.addItem(MenuAction(icons::Refresh, locale::CHECK_FOR_UPDATES, MA_Update));
+		//if(!game_running && !STEAM_EQUIV_BUILD)
+			//items.addItem(MenuAction(icons::Refresh, locale::CHECK_FOR_UPDATES, MA_Update));
 		items.addItem(MenuAction(Sprite(spritesheet::MenuIcons, 4), locale::MULTIPLAYER, MA_Multiplayer));
 		items.addItem(MenuAction(Sprite(material::TabDesigns), locale::SANDBOX, MA_Sandbox));
 		if(IRC.running)
diff --git a/source/game/main/initialization.cpp b/source/game/main/initialization.cpp
index c4e7b3d..b3be41c 100644
--- a/source/game/main/initialization.cpp
+++ b/source/game/main/initialization.cpp
@@ -87,19 +87,21 @@ bool hasDLC(const std::string& name) {
 }
 
 void checkDLC(const std::string& name, const std::string& hashname) {
-	std::string fname("data/dlc/");
-	fname += hashname;
-	if(fileExists(fname) || (devices.cloud && devices.cloud->hasDLC(name)))
-		dlcList.insert(name);
+	//std::string fname("data/dlc/");
+	//fname += hashname;
+	//if(fileExists(fname) || (devices.cloud && devices.cloud->hasDLC(name)))
+
+	// Open source version always has DLC
+	dlcList.insert(name);
 }
 
 void checkDLC() {
 	dlcList.clear();
-	checkDLC("Heralds", "bb8280a0fdc547ddbd8d3ae3f9242a14");
+	checkDLC("Heralds", "");
 }
 
 void checkCloudDLC(const std::string& name, const std::string& hashname) {
-	std::string fname("data/dlc/");
+	/*std::string fname("data/dlc/");
 	fname += hashname;
 
 	if(devices.cloud->hasDLC(name)) {
@@ -115,14 +117,17 @@ void checkCloudDLC(const std::string& name, const std::string& hashname) {
 		if(fileExists(fname))
 			remove(fname.c_str());
 		dlcList.erase(name);
-	}
+	}*/
+
+	// Open source version always has DLC
+	dlcList.insert(name);
 }
 
 void checkCloudDLC() {
 	if(!devices.cloud)
 		return;
 
-	checkCloudDLC("Heralds", "bb8280a0fdc547ddbd8d3ae3f9242a14");
+	checkCloudDLC("Heralds", "");
 }
 
 extern const render::Shader* fsShader;