Draw the Tiles splash screen before initialising the database.

It leaves a better impression if the player has a pretty screen to
look at while waiting for the database getting ready. (KiloByte)

2 files changed, 11 insertions, 6 deletions

diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 03cd4ae32c..d85f4941ba 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -3749,6 +3749,17 @@ static bool _initialise(void)
     // Set up the Lua interpreter for the dungeon builder.
     init_dungeon_lua();
 
+#ifdef USE_TILE
+    // Draw the splash screen before the database gets initialised as that
+    // may take awhile and it's better if the player can look at a pretty
+    // screen while this happens.
+    if (!crawl_state.map_stat_gen && !crawl_state.test
+        && Options.tile_title_screen)
+    {
+        tiles.draw_title();
+    }
+#endif
+
     // Initialise internal databases.
     databaseSystemInit();
 
diff --git a/crawl-ref/source/ng-input.cc b/crawl-ref/source/ng-input.cc
index 8ec4678555..499a3e2143 100644
--- a/crawl-ref/source/ng-input.cc
+++ b/crawl-ref/source/ng-input.cc
@@ -14,12 +14,6 @@ extern std::string init_file_error; // defined in main.cc
 // Eventually, this should be something more grand. {dlb}
 void opening_screen(void)
 {
-#ifdef USE_TILE
-    // More grand... Like this? ;)
-    if (Options.tile_title_screen)
-        tiles.draw_title();
-#endif
-
     std::string msg =
     "<yellow>Hello, welcome to " CRAWL " " + Version::Long() + "!</yellow>" EOL
     "<brown>(c) Copyright 1997-2002 Linley Henzell, "