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 2016-01-13 19:54:23 +01:00
parent d0c587e445
commit bd5f838d6d
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
code/nel/include/nel/misc/path.h
View file

@ -497,7 +497,7 @@ public:
static void getFileListByName(const std::string &extension, const std::string &name, std::vector<std::string> &filenames); static void getFileListByName(const std::string &extension, const std::string &name, std::vector<std::string> &filenames);
/** Create a list of file having the requested string in the path and the requested extension /** Create a list of file having the requested string in the path and the requested extension
*/ */
static void getFileListByPath(const std::string &extension, const std::string &path, std::vector<std::string> &filenames); static void getFileListByPath(const std::string &extension, const std::string &path, std::vector<std::string> &filenames);
/** Make a path relative to another if possible, else doesn't change it. /** Make a path relative to another if possible, else doesn't change it.
@ -508,10 +508,10 @@ public:
static bool makePathRelative (const char *basePath, std::string &relativePath); static bool makePathRelative (const char *basePath, std::string &relativePath);
/** Make path absolute /** Make path absolute
* \param relativePath - The relative path * \param relativePath - The relative path
* \param directory - the directory to which the path is relative to * \param directory - the directory to which the path is relative to
* returns the absolute path, or empty if something went wrong. * returns the absolute path, or empty if something went wrong.
*/ */
static std::string makePathAbsolute (const std::string &relativePath, const std::string &directory ); static std::string makePathAbsolute (const std::string &relativePath, const std::string &directory );
/** Return if a path is absolute or not. /** Return if a path is absolute or not.
@ -525,7 +525,7 @@ public:
static void addIgnoredDoubleFile(const std::string &ignoredFile); static void addIgnoredDoubleFile(const std::string &ignoredFile);
/** For the moment after memoryCompress you cant addsearchpath anymore /** For the moment after memoryCompress you cant addsearchpath anymore
*/ */
static void memoryCompress(); static void memoryCompress();
static void memoryUncompress(); static void memoryUncompress();
@ -533,17 +533,17 @@ public:
static bool isMemoryCompressed() { return getInstance()->_FileContainer.isMemoryCompressed(); } static bool isMemoryCompressed() { return getInstance()->_FileContainer.isMemoryCompressed(); }
/** Get the ms windows directory (in standardized way with end slash), or returns an empty string on other os /** Get the ms windows directory (in standardized way with end slash), or returns an empty string on other os
*/ */
static std::string getWindowsDirectory(); static std::string getWindowsDirectory();
/** Get application directory. /** Get application directory.
* \return directory where applications should write files. * \return directory where applications should write files.
*/ */
static std::string getApplicationDirectory(const std::string &appName = ""); static std::string getApplicationDirectory(const std::string &appName = "");
/** Get a temporary directory. /** Get a temporary directory.
* \return temporary directory where applications should write files. * \return temporary directory where applications should write files.
*/ */
static std::string getTemporaryDirectory(); static std::string getTemporaryDirectory();
// release singleton // release singleton

2
code/ryzom/tools/skill_extractor/skill_extractor.cpp
View file

@ -542,7 +542,6 @@ sint main( sint argc, char ** argv )
// output begin skill.h file // output begin skill.h file
//if( ! fo.open( string( "r:/code/ryzom/src_v2/game_share/skills.h" ) ) )
if( ! fo.open( srcDir + string( "skills.h" ) ) ) if( ! fo.open( srcDir + string( "skills.h" ) ) )
{ {
nlwarning(" Can't open file %s for writing", "skills.h" ); nlwarning(" Can't open file %s for writing", "skills.h" );
@ -648,7 +647,6 @@ sint main( sint argc, char ** argv )
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
// begin output skill.cpp file // begin output skill.cpp file
// if( ! fo.open( string( "r:/code/ryzom/src_v2/game_share/skills.cpp" ) ) )
if( ! fo.open( srcDir + string( "skills.cpp" ) ) ) if( ! fo.open( srcDir + string( "skills.cpp" ) ) )
{ {
nlwarning(" Can't open file skills.cpp for writing"); nlwarning(" Can't open file skills.cpp for writing");