Add a hidden preference to skip the Spiderweb logo at startup

The same preference also skips the scenario editor startup splash
In order to enable that, the scenario editor now loads prefs.
This commit is contained in:
2020-01-19 14:42:38 -05:00
parent 36b4f6edc1
commit e4b98a1634
2 changed files with 8 additions and 2 deletions

View File

@@ -178,6 +178,10 @@ void init_boe(int argc, char* argv[]) {
init_startup(); init_startup();
flushingInput = true; flushingInput = true;
show_logo(); show_logo();
// Hidden preference to hide the startup logo - should be kept hidden
if(get_bool_pref("ShowStartupLogo", true))
show_logo();
// The preference to hide the startup splash is exposed however.
if(get_bool_pref("ShowStartupSplash", true)) if(get_bool_pref("ShowStartupSplash", true))
plop_fancy_startup(); plop_fancy_startup();

View File

@@ -25,6 +25,7 @@
#include "choicedlog.hpp" #include "choicedlog.hpp"
#include "scen.menus.hpp" #include "scen.menus.hpp"
#include "res_image.hpp" #include "res_image.hpp"
#include "prefs.hpp"
/* Globals */ /* Globals */
bool All_Done = false; bool All_Done = false;
@@ -101,7 +102,7 @@ static void init_sbar(std::shared_ptr<cScrollbar>& sbar, rectangle rect, int pgS
void init_scened(int argc, char* argv[]) { void init_scened(int argc, char* argv[]) {
init_directories(argv[0]); init_directories(argv[0]);
init_menubar(); init_menubar();
// TODO: Sync and load prefs sync_prefs();
init_shaders(); init_shaders();
init_tiling(); init_tiling();
init_snd_tool(); init_snd_tool();
@@ -151,7 +152,8 @@ void init_scened(int argc, char* argv[]) {
load_graphics(); load_graphics();
cDialog::init(); cDialog::init();
}); });
run_startup_g(); if(get_bool_pref("ShowStartupLogo", true))
run_startup_g();
init_thread.join(); init_thread.join();
set_cursor(sword_curs); set_cursor(sword_curs);