From 32cd1ae4dd20878b730e486d1fd961a5b3947984 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 8 Aug 2019 01:48:55 +0000
Subject: [PATCH] Tweak the fatal engine initialization error and game already
 running dialog boxes a bit

git-svn-id: https://svn.eduke32.com/eduke32@7921 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/build.cpp
---
 source/build/src/engine.cpp |  4 ++++
 source/duke3d/src/game.cpp  | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp
index c1f325156..1204febf5 100644
--- a/source/build/src/engine.cpp
+++ b/source/build/src/engine.cpp
@@ -1492,7 +1492,11 @@ static int32_t bakrendmode;
 #endif
 static int32_t baktile;
 
+#ifdef APPNAME
+char apptitle[256] = APPNAME;
+#else
 char apptitle[256] = "Build Engine";
+#endif
 
 //
 // Internal Engine Functions
diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp
index 723319801..16cf73fc1 100644
--- a/source/duke3d/src/game.cpp
+++ b/source/duke3d/src/game.cpp
@@ -5875,10 +5875,10 @@ static void G_HandleMemErr(int32_t lineNum, const char *fileName, const char *fu
 
 static void G_FatalEngineError(void)
 {
-    wm_msgbox("Build Engine Initialization Error",
-              "There was a problem initializing the Build engine: %s", engineerrstr);
+    wm_msgbox("Fatal Engine Initialization Error",
+              "There was a problem initializing the engine: %s\n\nThe application will now close.", engineerrstr);
     G_Cleanup();
-    ERRprintf("G_Startup: There was a problem initializing the Build engine: %s\n", engineerrstr);
+    ERRprintf("G_Startup: There was a problem initializing the engine: %s\n", engineerrstr);
     exit(6);
 }
 
@@ -6223,9 +6223,9 @@ int app_main(int argc, char const * const * argv)
     if (!G_CheckCmdSwitch(argc, argv, "-noinstancechecking") && win_checkinstance())
     {
 #ifdef EDUKE32_STANDALONE
-        if (!wm_ynbox(APPNAME, APPNAME " is already running. "
+        if (!wm_ynbox(APPNAME, "It looks like " APPNAME " is already running.\n\n"
 #else
-        if (!wm_ynbox(APPNAME, "Another Build game is currently running. "
+        if (!wm_ynbox(APPNAME, "It looks like the game is already running.\n\n"
 #endif
                       "Are you sure you want to start another copy?"))
             return 3;