From bd5f838d6ddf117be558dcd1785e82cec849066d Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 13 Jan 2016 19:54:23 +0100 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- code/nel/include/nel/misc/path.h | 22 +++++++++---------- .../3d/build_far_bank/build_far_bank.cpp | 8 +++---- .../tools/skill_extractor/skill_extractor.cpp | 2 -- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/code/nel/include/nel/misc/path.h b/code/nel/include/nel/misc/path.h index ffae98f92..20ea9b2a9 100644 --- a/code/nel/include/nel/misc/path.h +++ b/code/nel/include/nel/misc/path.h @@ -497,7 +497,7 @@ public: static void getFileListByName(const std::string &extension, const std::string &name, std::vector &filenames); /** 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 &filenames); /** 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); /** Make path absolute - * \param relativePath - The relative path - * \param directory - the directory to which the path is relative to - * returns the absolute path, or empty if something went wrong. - */ + * \param relativePath - The relative path + * \param directory - the directory to which the path is relative to + * returns the absolute path, or empty if something went wrong. + */ static std::string makePathAbsolute (const std::string &relativePath, const std::string &directory ); /** Return if a path is absolute or not. @@ -525,7 +525,7 @@ public: static void addIgnoredDoubleFile(const std::string &ignoredFile); /** For the moment after memoryCompress you cant addsearchpath anymore - */ + */ static void memoryCompress(); static void memoryUncompress(); @@ -533,17 +533,17 @@ public: 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 - */ + */ static std::string getWindowsDirectory(); /** 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 = ""); /** Get a temporary directory. - * \return temporary directory where applications should write files. - */ + * \return temporary directory where applications should write files. + */ static std::string getTemporaryDirectory(); // release singleton diff --git a/code/nel/tools/3d/build_far_bank/build_far_bank.cpp b/code/nel/tools/3d/build_far_bank/build_far_bank.cpp index 05130b908..dfc3f7f65 100644 --- a/code/nel/tools/3d/build_far_bank/build_far_bank.cpp +++ b/code/nel/tools/3d/build_far_bank/build_far_bank.cpp @@ -80,7 +80,7 @@ bool fillTileFar (uint tile, const char* sName, CTileFarBank::TFarType type, CTi // Get bitmap size uint width=bitmap.getWidth(); uint height=bitmap.getHeight(); - + // Check size.. if ((!((_256&&(width==256)&&(height==256))||((!_256)&&(width==128)&&(height==128))))) @@ -210,7 +210,7 @@ int main (int argc, char **argv) // Serial the bank in input farBank.serial (inputFarBank); } - + // Force recomputation ? if (recompute (argv[1], argv[2])) { @@ -294,7 +294,7 @@ int main (int argc, char **argv) { // One more tile tileCount++; - + printf ("Skipping %s...\n", tileFilename.c_str()); bDeleteDiffuse=false; } @@ -405,7 +405,7 @@ int main (int argc, char **argv) { nlwarning ("ERROR Can't open file %s for reading\n", argv[1]); } - } + } // exit return 0; diff --git a/code/ryzom/tools/skill_extractor/skill_extractor.cpp b/code/ryzom/tools/skill_extractor/skill_extractor.cpp index a37d22ba8..054d5788c 100644 --- a/code/ryzom/tools/skill_extractor/skill_extractor.cpp +++ b/code/ryzom/tools/skill_extractor/skill_extractor.cpp @@ -542,7 +542,6 @@ sint main( sint argc, char ** argv ) // 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" ) ) ) { 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 -// if( ! fo.open( string( "r:/code/ryzom/src_v2/game_share/skills.cpp" ) ) ) if( ! fo.open( srcDir + string( "skills.cpp" ) ) ) { nlwarning(" Can't open file skills.cpp for writing");