mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-05 14:59:03 +00:00
Changed: #878 Fix typos in comments/code
This commit is contained in:
parent
6881ee0ec2
commit
e9023e9a49
2 changed files with 8 additions and 12 deletions
|
@ -161,7 +161,7 @@ inline void IStream::serial(sint32 &b)
|
|||
inline void IStream::serial(uint64 &b)
|
||||
{
|
||||
#ifdef NL_LITTLE_ENDIAN
|
||||
serialBuffer((uint8 *)&b, 8);
|
||||
serialBuffer((uint8 *)&b, 8);
|
||||
#else // NL_LITTLE_ENDIAN
|
||||
uint64 v;
|
||||
if(isReading())
|
||||
|
|
|
@ -551,14 +551,13 @@ bool CInterfaceParser::parseInterface (const std::vector<std::string> & strings,
|
|||
firstFileName = *it;
|
||||
string filename = CPath::lookup(firstFileName);
|
||||
bool isInData = false;
|
||||
if (filename.find ("@") != string::npos)
|
||||
string::size_type pos = filename.find ("@");
|
||||
if (pos != string::npos)
|
||||
{
|
||||
vector<string> bigFilePaths;
|
||||
CBigFile::getInstance().getBigFilePaths(bigFilePaths);
|
||||
if (CBigFile::getInstance().getBigFileName(filename.substr(0, filename.find ("@"))) != "data/"+filename.substr(0, filename.find ("@")))
|
||||
isInData = false;
|
||||
else
|
||||
isInData = true;
|
||||
std::string bigFilename = CBigFile::getInstance().getBigFileName(filename.substr(0, pos));
|
||||
std::string path = "data/"+filename.substr(0, pos);
|
||||
|
||||
isInData = bigFilename.find(path) != std::string::npos;
|
||||
}
|
||||
|
||||
if ((needCheck && !isInData) || !file.open (CPath::lookup(firstFileName)))
|
||||
|
@ -654,10 +653,7 @@ bool CInterfaceParser::parseInterface (const std::vector<std::string> & strings,
|
|||
if (saveParseResult)
|
||||
{
|
||||
nlassert(isFilename);
|
||||
std::string outputFilename = std::string("data/") + CFile::getFilename(nextFileName) + std::string("_compressed");
|
||||
#ifdef NL_OS_WINDOWS
|
||||
outputFilename = CPath::standardizeDosPath(outputFilename);
|
||||
#endif
|
||||
std::string outputFilename = CPath::standardizePath("data") + CFile::getFilename(nextFileName) + std::string("_compressed");
|
||||
COFile f;
|
||||
f.open(outputFilename);
|
||||
f.serialCheck(UI_CACHE_SERIAL_CHECK);
|
||||
|
|
Loading…
Reference in a new issue