From e4b98a16347adeabef8f7d98defc7287c9977f4b Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sun, 19 Jan 2020 14:42:38 -0500 Subject: [PATCH] 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. --- src/game/boe.main.cpp | 4 ++++ src/scenedit/scen.main.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/game/boe.main.cpp b/src/game/boe.main.cpp index 6271d9e6..e390cfcf 100644 --- a/src/game/boe.main.cpp +++ b/src/game/boe.main.cpp @@ -178,6 +178,10 @@ void init_boe(int argc, char* argv[]) { init_startup(); flushingInput = true; 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)) plop_fancy_startup(); diff --git a/src/scenedit/scen.main.cpp b/src/scenedit/scen.main.cpp index e6a34b12..befda3a0 100644 --- a/src/scenedit/scen.main.cpp +++ b/src/scenedit/scen.main.cpp @@ -25,6 +25,7 @@ #include "choicedlog.hpp" #include "scen.menus.hpp" #include "res_image.hpp" +#include "prefs.hpp" /* Globals */ bool All_Done = false; @@ -101,7 +102,7 @@ static void init_sbar(std::shared_ptr& sbar, rectangle rect, int pgS void init_scened(int argc, char* argv[]) { init_directories(argv[0]); init_menubar(); - // TODO: Sync and load prefs + sync_prefs(); init_shaders(); init_tiling(); init_snd_tool(); @@ -151,7 +152,8 @@ void init_scened(int argc, char* argv[]) { load_graphics(); cDialog::init(); }); - run_startup_g(); + if(get_bool_pref("ShowStartupLogo", true)) + run_startup_g(); init_thread.join(); set_cursor(sword_curs);