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

Changed: Minor changes

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2017-11-05 19:07:19 +01:00
parent d099e98dae
commit 93c2f55290
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/src/misc/common.cpp
View file

@ -894,8 +894,8 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
int status = vfork (); int status = vfork ();
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
/// WARNING : NO MORE INSTRUCTION AFTER VFORK ! // WARNING : NO MORE INSTRUCTION AFTER VFORK !
/// READ VFORK manual // READ VFORK manual
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
if (status == -1) if (status == -1)
{ {
@ -1000,8 +1000,8 @@ bool launchProgramArray (const std::string &programName, const std::vector<std::
int status = vfork (); int status = vfork ();
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
/// WARNING : NO MORE INSTRUCTION AFTER VFORK ! // WARNING : NO MORE INSTRUCTION AFTER VFORK !
/// READ VFORK manual // READ VFORK manual
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
if (status == -1) if (status == -1)
{ {

4
code/ryzom/client/src/login_patch.cpp
View file

@ -764,7 +764,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
{ {
// don't check result, because it's possible the olk file doesn't exist // don't check result, because it's possible the olk file doesn't exist
CFile::deleteFile(fullDstPath + FileName); CFile::deleteFile(fullDstPath + FileName);
// try to move it, if fails move it later in a script // try to move it, if fails move it later in a script
if (CFile::moveFile(fullDstPath + FileName, ClientPatchPath + FileName)) if (CFile::moveFile(fullDstPath + FileName, ClientPatchPath + FileName))
succeeded = true; succeeded = true;
@ -993,7 +993,7 @@ void CPatchManager::executeBatchFile()
std::string batchFilename; std::string batchFilename;
std::vector<std::string> arguments; std::vector<std::string> arguments;
std::string startupPath = Args.getStartupPath(); std::string startupPath = Args.getStartupPath();
// 3 first parameters are Ryzom client full path, patch directory full path and client root directory full path // 3 first parameters are Ryzom client full path, patch directory full path and client root directory full path

1
code/ryzom/client/src/user_entity.h
View file

@ -423,6 +423,7 @@ public:
void tp(const NLMISC::CVectorD &dest); void tp(const NLMISC::CVectorD &dest);
/// Teleport the player to correct his position. /// Teleport the player to correct his position.
void correctPos(const NLMISC::CVectorD &dest); void correctPos(const NLMISC::CVectorD &dest);
/// Skill Up /// Skill Up
void skillUp(); void skillUp();
/// get the level of the player (max of all skills) /// get the level of the player (max of all skills)