Changed: Use application or current directory as root directory for patch

This commit is contained in:
kervala 2016-02-02 19:22:25 +01:00
parent 13c4282911
commit 12204bb7e8

View file

@ -47,6 +47,7 @@
#include "nel/misc/sha1.h" #include "nel/misc/sha1.h"
#include "nel/misc/big_file.h" #include "nel/misc/big_file.h"
#include "nel/misc/i18n.h" #include "nel/misc/i18n.h"
#include "nel/misc/cmd_args.h"
#include "game_share/bg_downloader_msg.h" #include "game_share/bg_downloader_msg.h"
@ -89,6 +90,8 @@ extern string R2ServerVersion;
std::string TheTmpInstallDirectory = "patch/client_install"; std::string TheTmpInstallDirectory = "patch/client_install";
#endif #endif
extern NLMISC::CCmdArgs Args;
// **************************************************************************** // ****************************************************************************
// **************************************************************************** // ****************************************************************************
// **************************************************************************** // ****************************************************************************
@ -120,8 +123,16 @@ CPatchManager::CPatchManager() : State("t_state"), DataScanState("t_data_scan_st
UpdateBatchFilename = "updt_nl.sh"; UpdateBatchFilename = "updt_nl.sh";
#endif #endif
// use current directory by default // use application directory by default
setClientRootPath("./"); std::string rootPath = Args.getProgramPath();
if (!CFile::fileExists(rootPath + "client_default.cfg"))
{
// use current directory
rootPath = CPath::getCurrentPath();
}
setClientRootPath(rootPath);
VerboseLog = true; VerboseLog = true;