Changed: Minor changes
This commit is contained in:
parent
f076548844
commit
e9f8202701
3 changed files with 4 additions and 3 deletions
|
@ -567,7 +567,7 @@ void CI18N::readTextFile(const string &filename,
|
||||||
|
|
||||||
if (!readContext.IfStack.empty())
|
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() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1039,7 +1039,7 @@ void CSoundManager::loadProperties(const string &soundName, USource *source)
|
||||||
// While the end of the file is not reached.
|
// While the end of the file is not reached.
|
||||||
while(!file.eof())
|
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);
|
file.getline(tmpBuff, 260);
|
||||||
char *token = strtok(tmpBuff, delimiterBox);
|
char *token = strtok(tmpBuff, delimiterBox);
|
||||||
while(token != NULL)
|
while(token != NULL)
|
||||||
|
|
|
@ -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;
|
_ArgOffset=oldArgOffset;
|
||||||
_TokenOffset=oldTokenOffset;
|
_TokenOffset=oldTokenOffset;
|
||||||
_ReadingStructStack=oldRSS;
|
_ReadingStructStack=oldRSS;
|
||||||
|
@ -1117,6 +1117,7 @@ bool CPersistentDataRecord::readFromFile(const std::string &fileName)
|
||||||
{
|
{
|
||||||
H_AUTO(pdrReadFromFile)
|
H_AUTO(pdrReadFromFile)
|
||||||
|
|
||||||
|
// TODO: see why code is different under Linux and Windows
|
||||||
#ifdef NL_OS_WINDOWS
|
#ifdef NL_OS_WINDOWS
|
||||||
|
|
||||||
// open the file
|
// open the file
|
||||||
|
|
Loading…
Reference in a new issue