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

Updated uses of CCmdParser to plCmdParser.

Browse Source
This commit is contained in:
Darryl Pogue
2015-06-05 22:00:45 -07:00
committed by Darryl Pogue
parent e801eadc8d
commit 24b20b718f
2 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plProduct.h" #include "plProduct.h"
#include "plNetGameLib/plNetGameLib.h" #include "plNetGameLib/plNetGameLib.h"
#include "plPhysX/plSimulationMgr.h" #include "plPhysX/plSimulationMgr.h"
#include "pnUtils/plCmdParser.h"
#include "res/resource.h" #include "res/resource.h"
@ -96,11 +97,11 @@ enum
kArgSkipPreload kArgSkipPreload
}; };
static const CmdArgDef s_cmdLineArgs[] = { static const plCmdArgDef s_cmdLineArgs[] = {
{ kCmdArgFlagged | kCmdTypeBool, L"SkipLoginDialog", kArgSkipLoginDialog }, { kCmdArgFlagged | kCmdTypeBool, "SkipLoginDialog", kArgSkipLoginDialog },
{ kCmdArgFlagged | kCmdTypeString, L"ServerIni", kArgServerIni }, { kCmdArgFlagged | kCmdTypeString, "ServerIni", kArgServerIni },
{ kCmdArgFlagged | kCmdTypeBool, L"LocalData", kArgLocalData }, { kCmdArgFlagged | kCmdTypeBool, "LocalData", kArgLocalData },
{ kCmdArgFlagged | kCmdTypeBool, L"SkipPreload", kArgSkipPreload }, { kCmdArgFlagged | kCmdTypeBool, "SkipPreload", kArgSkipPreload },
}; };
/// Made globals now, so we can set them to zero if we take the border and /// Made globals now, so we can set them to zero if we take the border and
@ -1132,8 +1133,14 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
// Set global handle // Set global handle
gHInst = hInst; gHInst = hInst;
CCmdParser cmdParser(s_cmdLineArgs, arrsize(s_cmdLineArgs)); std::vector<plString> args;
cmdParser.Parse(); args.reserve(__argc);
for (size_t i = 0; i < __argc; i++) {
args.push_back(plString::FromWchar(__wargv[i]));
}
plCmdParser cmdParser(s_cmdLineArgs, arrsize(s_cmdLineArgs));
cmdParser.Parse(args);
bool doIntroDialogs = true; bool doIntroDialogs = true;
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
@ -1150,7 +1157,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
plFileName serverIni = "server.ini"; plFileName serverIni = "server.ini";
if (cmdParser.IsSpecified(kArgServerIni)) if (cmdParser.IsSpecified(kArgServerIni))
serverIni = plString::FromWchar(cmdParser.GetString(kArgServerIni)); serverIni = cmdParser.GetString(kArgServerIni);
// check to see if we were launched from the patcher // check to see if we were launched from the patcher
bool eventExists = false; bool eventExists = false;

29
Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp
View File

@ -47,7 +47,8 @@ Mead, WA 99021
#include "hsThread.h" #include "hsThread.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "pnUtils/pnUtils.h" // for CCmdParser #include "pnUtils/pnUtils.h"
#include "pnUtils/plCmdParser.h"
#include "pnAsyncCore/pnAsyncCore.h" #include "pnAsyncCore/pnAsyncCore.h"
#include "plNetGameLib/plNetGameLib.h" #include "plNetGameLib/plNetGameLib.h"
#include "plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
@ -432,21 +433,27 @@ void plClientLauncher::ParseArguments()
enum { kArgServerIni, kArgNoSelfPatch, kArgImage, kArgRepairGame, kArgPatchOnly, enum { kArgServerIni, kArgNoSelfPatch, kArgImage, kArgRepairGame, kArgPatchOnly,
kArgSkipLoginDialog }; kArgSkipLoginDialog };
const CmdArgDef cmdLineArgs[] = { const plCmdArgDef cmdLineArgs[] = {
{ kCmdArgFlagged | kCmdTypeString, L"ServerIni", kArgServerIni }, { kCmdArgFlagged | kCmdTypeString, "ServerIni", kArgServerIni },
{ kCmdArgFlagged | kCmdTypeBool, L"NoSelfPatch", kArgNoSelfPatch }, { kCmdArgFlagged | kCmdTypeBool, "NoSelfPatch", kArgNoSelfPatch },
{ kCmdArgFlagged | kCmdTypeBool, L"Image", kArgImage }, { kCmdArgFlagged | kCmdTypeBool, "Image", kArgImage },
{ kCmdArgFlagged | kCmdTypeBool, L"Repair", kArgRepairGame }, { kCmdArgFlagged | kCmdTypeBool, "Repair", kArgRepairGame },
{ kCmdArgFlagged | kCmdTypeBool, L"PatchOnly", kArgPatchOnly }, { kCmdArgFlagged | kCmdTypeBool, "PatchOnly", kArgPatchOnly },
{ kCmdArgFlagged | kCmdTypeBool, L"SkipLoginDialog", kArgSkipLoginDialog } { kCmdArgFlagged | kCmdTypeBool, "SkipLoginDialog", kArgSkipLoginDialog }
}; };
CCmdParser cmdParser(cmdLineArgs, arrsize(cmdLineArgs)); std::vector<plString> args;
cmdParser.Parse(); args.reserve(__argc);
for (size_t i = 0; i < __argc; i++) {
args.push_back(plString::FromWchar(__wargv[i]));
}
plCmdParser cmdParser(cmdLineArgs, arrsize(cmdLineArgs));
cmdParser.Parse(args);
// cache 'em // cache 'em
if (cmdParser.IsSpecified(kArgServerIni)) if (cmdParser.IsSpecified(kArgServerIni))
fServerIni = plString::FromWchar(cmdParser.GetString(kArgServerIni)); fServerIni = cmdParser.GetString(kArgServerIni);
APPLY_FLAG(kArgNoSelfPatch, kHaveSelfPatched); APPLY_FLAG(kArgNoSelfPatch, kHaveSelfPatched);
APPLY_FLAG(kArgImage, kClientImage); APPLY_FLAG(kArgImage, kClientImage);
APPLY_FLAG(kArgRepairGame, kRepairGame); APPLY_FLAG(kArgRepairGame, kRepairGame);