OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04: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,
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))
const wchar *serverIni = L"server.ini";
if(cmdParser.IsSpecified(kArgServerIni))
{
SetFileSrvHostname(cmdParser.GetString(kArgFileSrv));
}
if(cmdParser.IsSpecified(kArgGateKeeperSrv))
{
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);