Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Add other parameters for client

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-02-15 12:07:49 +01:00
parent 2330fc26ec
commit 5981452e42
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
code/ryzom/client/src/client.cpp
View file

@ -17,7 +17,6 @@
#include "stdpch.h" #include "stdpch.h"
#include "user_agent.h"
////////////// //////////////
// INCLUDES // // INCLUDES //
@ -45,7 +44,6 @@
//#define TEST_CRASH_COUNTER //#define TEST_CRASH_COUNTER
#ifdef TEST_CRASH_COUNTER #ifdef TEST_CRASH_COUNTER
#include "nel/net/email.h"
#undef FINAL_VERSION #undef FINAL_VERSION
#define FINAL_VERSION 1 #define FINAL_VERSION 1
#endif // TEST_CRASH_COUNTER #endif // TEST_CRASH_COUNTER
@ -61,6 +59,7 @@
#include "release.h" #include "release.h"
#include "client_cfg.h" #include "client_cfg.h"
#include "far_tp.h" #include "far_tp.h"
#include "user_agent.h"
/////////// ///////////
// USING // // USING //
@ -177,6 +176,12 @@ int main(int argc, char **argv)
Args.addAdditionalArg("password", "Password to use", true, false); Args.addAdditionalArg("password", "Password to use", true, false);
Args.addAdditionalArg("shard_id", "Shard ID to use", true, false); Args.addAdditionalArg("shard_id", "Shard ID to use", true, false);
#ifdef TEST_CRASH_COUNTER
Args.addArg("", "crash", "", "Crash client before init");
Args.addArg("", "break", "", "Create a break point");
Args.addArg("", "release", "", "Crash client after init");
#endif // TEST_CRASH_COUNTER
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
if (!Args.parse(cmdline)) return 1; if (!Args.parse(cmdline)) return 1;
#else #else
@ -214,6 +219,13 @@ int main(int argc, char **argv)
CPath::setCurrentPath(currentPath); CPath::setCurrentPath(currentPath);
} }
#ifdef TEST_CRASH_COUNTER
if (Args.haveLongArg("crash"))
{
volatile int toto = *(int*)0;
}
#endif // TEST_CRASH_COUNTER
#ifdef NL_OS_MAC #ifdef NL_OS_MAC
struct rlimit rlp, rlp2, rlp3; struct rlimit rlp, rlp2, rlp3;
@ -233,19 +245,8 @@ int main(int argc, char **argv)
#if defined(NL_OS_WINDOWS) #if defined(NL_OS_WINDOWS)
#if FINAL_VERSION
//initCrashReport ();
#endif // FINAL_VERSION
// Set default email value for reporting error
#ifdef TEST_CRASH_COUNTER #ifdef TEST_CRASH_COUNTER
// initCrashReport (); if (Args.haveLongArg("break"))
// setReportEmailFunction ((void*)sendEmail);
// setDefaultEmailParams ("smtp.nevrax.com", "", "hulud@nevrax.com");
if (string(cmdline) == "/crash")
volatile int toto = *(int*)0;
if (string(cmdline) == "/break")
{ {
__debugbreak(); __debugbreak();
} }
@ -406,8 +407,10 @@ int main(int argc, char **argv)
//CFile::createEmptyFile(getLogDirectory() + "during_release"); //CFile::createEmptyFile(getLogDirectory() + "during_release");
#ifdef TEST_CRASH_COUNTER #ifdef TEST_CRASH_COUNTER
if (string(cmdline) == "/release") if (Args.haveLongArg("release"))
{
volatile int toto = *(int*)0; volatile int toto = *(int*)0;
}
#endif // TEST_CRASH_COUNTER #endif // TEST_CRASH_COUNTER
// Final release // Final release