From 131813ab5dbd405756bf82083aefcc583b4e1839 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 20 Feb 2016 18:53:39 +0100 Subject: [PATCH] Changed: Minor changes --- code/nel/src/misc/i18n.cpp | 2 +- code/ryzom/client/src/sound_manager.cpp | 2 +- code/ryzom/common/src/game_share/persistent_data.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/nel/src/misc/i18n.cpp b/code/nel/src/misc/i18n.cpp index 99e9c68a0..427c102da 100644 --- a/code/nel/src/misc/i18n.cpp +++ b/code/nel/src/misc/i18n.cpp @@ -567,7 +567,7 @@ void CI18N::readTextFile(const string &filename, if (!readContext.IfStack.empty()) { - nlwarning("Preprocess: Missing %u closing #endif after parsing %s", readContext.IfStack.size(), filename.c_str() ); + nlwarning("Preprocess: Missing %u closing #endif after parsing %s", (uint)readContext.IfStack.size(), filename.c_str() ); } } diff --git a/code/ryzom/client/src/sound_manager.cpp b/code/ryzom/client/src/sound_manager.cpp index 0374a0e1a..5c1f49b1c 100644 --- a/code/ryzom/client/src/sound_manager.cpp +++ b/code/ryzom/client/src/sound_manager.cpp @@ -1039,7 +1039,7 @@ void CSoundManager::loadProperties(const string &soundName, USource *source) // While the end of the file is not reached. while(!file.eof()) { - // Get a line (teh line should not be more than _MAX_LINE_SIZE). + // Get a line (the line should not be more than _MAX_LINE_SIZE). file.getline(tmpBuff, 260); char *token = strtok(tmpBuff, delimiterBox); while(token != NULL) diff --git a/code/ryzom/common/src/game_share/persistent_data.cpp b/code/ryzom/common/src/game_share/persistent_data.cpp index a9fe8b344..ad52a7b4d 100644 --- a/code/ryzom/common/src/game_share/persistent_data.cpp +++ b/code/ryzom/common/src/game_share/persistent_data.cpp @@ -520,7 +520,7 @@ uint32 CPersistentDataRecord::getNumValues() const } } - // restore the original values of teh state variables + // restore the original values of the state variables _ArgOffset=oldArgOffset; _TokenOffset=oldTokenOffset; _ReadingStructStack=oldRSS; @@ -1117,6 +1117,7 @@ bool CPersistentDataRecord::readFromFile(const std::string &fileName) { H_AUTO(pdrReadFromFile) + // TODO: see why code is different under Linux and Windows #ifdef NL_OS_WINDOWS // open the file