OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-21 20:59:09 +00:00
Code Releases Activity

Use a /ServerIni switch instead of separate server overrides, and check for the server.ini before trying to execute it

Browse Source
This commit is contained in:
Michael Hansen
2011-04-13 09:46:23 -07:00
parent 203fd0c229
commit 9177aed3b7
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Sources/Plasma/Apps/plClient/winmain.cpp
View File

@ -89,9 +89,7 @@ enum
{ {
kArgToDni, kArgToDni,
kArgSkipLoginDialog, kArgSkipLoginDialog,
kArgAuthSrv, kArgServerIni,
kArgFileSrv,
kArgGateKeeperSrv,
kArgLocalData, kArgLocalData,
kArgBackgroundDownloader, kArgBackgroundDownloader,
}; };
@ -99,9 +97,7 @@ enum
static const CmdArgDef s_cmdLineArgs[] = { static const CmdArgDef s_cmdLineArgs[] = {
{ kCmdArgFlagged | kCmdTypeBool, L"ToDni", kArgToDni }, { kCmdArgFlagged | kCmdTypeBool, L"ToDni", kArgToDni },
{ kCmdArgFlagged | kCmdTypeBool, L"SkipLoginDialog", kArgSkipLoginDialog }, { kCmdArgFlagged | kCmdTypeBool, L"SkipLoginDialog", kArgSkipLoginDialog },
{ kCmdArgFlagged | kCmdTypeString, L"AuthSrv", kArgAuthSrv }, { kCmdArgFlagged | kCmdTypeString, L"ServerIni", kArgServerIni },
{ kCmdArgFlagged | kCmdTypeString, L"FileSrv", kArgFileSrv },
{ kCmdArgFlagged | kCmdTypeString, L"GateKeeperSrv", kArgGateKeeperSrv },
{ kCmdArgFlagged | kCmdTypeBool, L"LocalData", kArgLocalData }, { kCmdArgFlagged | kCmdTypeBool, L"LocalData", kArgLocalData },
{ kCmdArgFlagged | kCmdTypeBool, L"BGDownload", kArgBackgroundDownloader }, { kCmdArgFlagged | kCmdTypeBool, L"BGDownload", kArgBackgroundDownloader },
}; };
@ -1576,19 +1572,11 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
if(cmdParser.IsSpecified(kArgBackgroundDownloader)) if(cmdParser.IsSpecified(kArgBackgroundDownloader))
gUseBackgroundDownloader = true; gUseBackgroundDownloader = true;
#endif #endif
if(cmdParser.IsSpecified(kArgAuthSrv))
{
SetAuthSrvHostname(cmdParser.GetString(kArgAuthSrv));
}
if(cmdParser.IsSpecified(kArgFileSrv)) const wchar *serverIni = L"server.ini";
if(cmdParser.IsSpecified(kArgServerIni))
{ {
SetFileSrvHostname(cmdParser.GetString(kArgFileSrv)); serverIni = cmdParser.GetString(kArgServerIni);
}
if(cmdParser.IsSpecified(kArgGateKeeperSrv))
{
SetGateKeeperSrvHostname(cmdParser.GetString(kArgGateKeeperSrv));
} }
// check to see if we were launched from the patcher // 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(); FILE *serverini = _wfopen(serverIni, L"rb");
tempConsole->ExecuteFile("server.ini"); if (serverini)
delete tempConsole; {
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); NetCliAuthAutoReconnectEnable(false);