From 9177aed3b7a35d0924c379414fa964cc1eaf7904 Mon Sep 17 00:00:00 2001
From: Michael Hansen <zrax0111@gmail.com>
Date: Wed, 13 Apr 2011 09:46:23 -0700
Subject: [PATCH] Use a /ServerIni switch instead of separate server overrides,
 and check for the server.ini before trying to execute it

---
 Sources/Plasma/Apps/plClient/winmain.cpp | 37 +++++++++++-------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp
index bbf6ab4f..984f50f9 100644
--- a/Sources/Plasma/Apps/plClient/winmain.cpp
+++ b/Sources/Plasma/Apps/plClient/winmain.cpp
@@ -89,9 +89,7 @@ enum
 {
     kArgToDni,
     kArgSkipLoginDialog,
-    kArgAuthSrv,
-    kArgFileSrv,
-    kArgGateKeeperSrv,
+    kArgServerIni,
     kArgLocalData,
     kArgBackgroundDownloader,
 };
@@ -99,9 +97,7 @@ enum
 static const CmdArgDef s_cmdLineArgs[] = {
     { kCmdArgFlagged  | kCmdTypeBool,       L"ToDni",           kArgToDni   },
     { kCmdArgFlagged  | kCmdTypeBool,       L"SkipLoginDialog", kArgSkipLoginDialog },
-    { kCmdArgFlagged  | kCmdTypeString,     L"AuthSrv",         kArgAuthSrv },
-    { kCmdArgFlagged  | kCmdTypeString,     L"FileSrv",         kArgFileSrv },
-    { kCmdArgFlagged  | kCmdTypeString,     L"GateKeeperSrv",   kArgGateKeeperSrv },
+    { kCmdArgFlagged  | kCmdTypeString,     L"ServerIni",       kArgServerIni },
     { kCmdArgFlagged  | kCmdTypeBool,       L"LocalData",       kArgLocalData   },
     { kCmdArgFlagged  | kCmdTypeBool,       L"BGDownload",      kArgBackgroundDownloader    },
 };
@@ -1576,19 +1572,11 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
     if(cmdParser.IsSpecified(kArgBackgroundDownloader))
         gUseBackgroundDownloader = true;
 #endif
-    if(cmdParser.IsSpecified(kArgAuthSrv))
-    {
-        SetAuthSrvHostname(cmdParser.GetString(kArgAuthSrv));
-    }
-
-    if(cmdParser.IsSpecified(kArgFileSrv))
-    {
-        SetFileSrvHostname(cmdParser.GetString(kArgFileSrv));
-    }
 
-    if(cmdParser.IsSpecified(kArgGateKeeperSrv))
+    const wchar *serverIni = L"server.ini";
+    if(cmdParser.IsSpecified(kArgServerIni))
     {
-        SetGateKeeperSrvHostname(cmdParser.GetString(kArgGateKeeperSrv));
+        serverIni = cmdParser.GetString(kArgServerIni);
     }
 
     // check to see if we were launched from the patcher
@@ -1679,9 +1667,18 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
     }
 
     /////////<<<<<<<<
-    pfConsoleEngine *tempConsole = TRACKED_NEW pfConsoleEngine();
-    tempConsole->ExecuteFile("server.ini");
-    delete tempConsole;
+    FILE *serverini = _wfopen(serverIni, L"rb");
+    if (serverini)
+    {
+        fclose(serverini);
+        pfConsoleEngine tempConsole;
+        tempConsole.ExecuteFile(serverIni);
+    }
+    else
+    {
+        hsMessageBox("No server.ini file found.  Please check your URU installation.", "Error", hsMessageBoxNormal);
+        return PARABLE_NORMAL_EXIT;
+    }
     /////////<<<<<<<<
 
     NetCliAuthAutoReconnectEnable(false);