bionickatana/starruler-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove updater from main menu, unlock woth by default.

Browse Source
This commit is contained in:
Lucas de Vries
2018-07-17 16:27:10 +02:00
parent b19a4c613d
commit 53ddbadefa
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/menu/main_menu.as
+2 -3
View File
@@ -28,7 +28,6 @@ enum MenuActions {
MA_Mods, MA_Mods,
}; };
class MainMenu : MenuBox {
MenuNews news; MenuNews news;
MainMenu() { MainMenu() {
@@ -61,8 +60,8 @@ class MainMenu : MenuBox {
if(game_running && !mpClient) if(game_running && !mpClient)
items.addItem(MenuAction(Sprite(spritesheet::MenuIcons, 2), locale::SAVE_GAME, MA_SaveGame)); items.addItem(MenuAction(Sprite(spritesheet::MenuIcons, 2), locale::SAVE_GAME, MA_SaveGame));
items.addItem(MenuAction(Sprite(spritesheet::ResourceIconsSmall, 46), locale::MODS_MENU, MA_Mods)); items.addItem(MenuAction(Sprite(spritesheet::ResourceIconsSmall, 46), locale::MODS_MENU, MA_Mods));
if(!game_running && !STEAM_EQUIV_BUILD) //if(!game_running && !STEAM_EQUIV_BUILD)
items.addItem(MenuAction(icons::Refresh, locale::CHECK_FOR_UPDATES, MA_Update)); //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(spritesheet::MenuIcons, 4), locale::MULTIPLAYER, MA_Multiplayer));
items.addItem(MenuAction(Sprite(material::TabDesigns), locale::SANDBOX, MA_Sandbox)); items.addItem(MenuAction(Sprite(material::TabDesigns), locale::SANDBOX, MA_Sandbox));
if(IRC.running) if(IRC.running)
source/game/main/initialization.cpp
+13 -8
View File
@@ -87,19 +87,21 @@ bool hasDLC(const std::string& name) {
} }
void checkDLC(const std::string& name, const std::string& hashname) { void checkDLC(const std::string& name, const std::string& hashname) {
std::string fname("data/dlc/"); //std::string fname("data/dlc/");
fname += hashname; //fname += hashname;
if(fileExists(fname) || (devices.cloud && devices.cloud->hasDLC(name))) //if(fileExists(fname) || (devices.cloud && devices.cloud->hasDLC(name)))
dlcList.insert(name);
// Open source version always has DLC
dlcList.insert(name);
} }
void checkDLC() { void checkDLC() {
dlcList.clear(); dlcList.clear();
checkDLC("Heralds", "bb8280a0fdc547ddbd8d3ae3f9242a14"); checkDLC("Heralds", "");
} }
void checkCloudDLC(const std::string& name, const std::string& hashname) { void checkCloudDLC(const std::string& name, const std::string& hashname) {
std::string fname("data/dlc/"); /*std::string fname("data/dlc/");
fname += hashname; fname += hashname;
if(devices.cloud->hasDLC(name)) { if(devices.cloud->hasDLC(name)) {
@@ -115,14 +117,17 @@ void checkCloudDLC(const std::string& name, const std::string& hashname) {
if(fileExists(fname)) if(fileExists(fname))
remove(fname.c_str()); remove(fname.c_str());
dlcList.erase(name); dlcList.erase(name);
} }*/
// Open source version always has DLC
dlcList.insert(name);
} }
void checkCloudDLC() { void checkCloudDLC() {
if(!devices.cloud) if(!devices.cloud)
return; return;
checkCloudDLC("Heralds", "bb8280a0fdc547ddbd8d3ae3f9242a14"); checkCloudDLC("Heralds", "");
} }
extern const render::Shader* fsShader; extern const render::Shader* fsShader;