From 6fb8ac956b5c32ff988f868b40841733114345a8 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 8 Jul 2006 01:31:35 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@215
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/eduke32/source/config.c |  1 -
 polymer/eduke32/source/game.c   | 15 +++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c
index 7dc62761e..02eda5cad 100644
--- a/polymer/eduke32/source/config.c
+++ b/polymer/eduke32/source/config.c
@@ -727,7 +727,6 @@ void CONFIG_WriteSetup( void )
     if (scripthandle < 0)
         scripthandle = SCRIPT_Init(setupfilename);
 
-
     SCRIPT_PutNumber( scripthandle, "Controls","AimingFlag",(long) myaimmode,false,false);
     SCRIPT_PutNumber( scripthandle, "Controls","AutoAim",AutoAim,false,false);
     SCRIPT_PutNumber( scripthandle, "Controls","MouseAimingFlipped",ud.mouseflip,false,false);
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index ad92d2c69..4334e0c5f 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -8511,9 +8511,11 @@ void Startup(void)
 
     //     readnames();
 
+    CONFIG_WriteSetup();
+
     compilecons();
 
-    //    i = CONFIG_ReadSetup();
+    CONFIG_ReadSetup();
 
     if (initengine()) {
         wm_msgbox("Build Engine Initialisation Error",
@@ -8821,6 +8823,12 @@ void app_main(int argc,char **argv)
 
     OSD_SetLogFile("eduke32.log");
 
+    wm_setapptitle(HEAD2);
+
+    initprintf("%s%s\n",apptitle," ("__DATE__" "__TIME__")");
+    initprintf("Copyright (c) 1996, 2003 3D Realms Entertainment\n");
+    initprintf("Copyright (c) 2006 EDuke32 team\n");
+
 #if defined(_WIN32)
     if (!access("user_profiles_enabled", F_OK))
 #else
@@ -8874,7 +8882,6 @@ void app_main(int argc,char **argv)
         }
     }
 
-    wm_setapptitle("EDuke32");
     if (preinitengine()) {
         wm_msgbox("Build Engine Initialisation Error",
                   "There was a problem initialising the Build engine: %s", engineerrstr);
@@ -8907,10 +8914,6 @@ void app_main(int argc,char **argv)
     if (VOLUMEALL) wm_setapptitle(HEAD2);
     else wm_setapptitle(HEAD);
 
-    initprintf("%s%s\n",apptitle," ("__DATE__" "__TIME__")");
-    initprintf("Copyright (c) 1996, 2003 3D Realms Entertainment\n");
-    initprintf("Copyright (c) 2006 EDuke32 team\n");
-
     ud.multimode = 1;
 
     checkcommandline(argc,argv);