aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-09-20 03:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #878 Fix typos in comments/code

Browse source
This commit is contained in:
kervala 2011-02-09 14:42:30 +01:00
parent 6881ee0ec2
commit e9023e9a49
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/misc/stream_inline.h
View file

@ -161,7 +161,7 @@ inline void IStream::serial(sint32 &b)
inline void IStream::serial(uint64 &b) inline void IStream::serial(uint64 &b)
{ {
#ifdef NL_LITTLE_ENDIAN #ifdef NL_LITTLE_ENDIAN
serialBuffer((uint8 *)&b, 8); serialBuffer((uint8 *)&b, 8);
#else // NL_LITTLE_ENDIAN #else // NL_LITTLE_ENDIAN
uint64 v; uint64 v;
if(isReading()) if(isReading())

18
code/ryzom/client/src/interface_v3/interface_parser.cpp
View file

@ -551,14 +551,13 @@ bool CInterfaceParser::parseInterface (const std::vector<std::string> & strings,
firstFileName = *it; firstFileName = *it;
string filename = CPath::lookup(firstFileName); string filename = CPath::lookup(firstFileName);
bool isInData = false; bool isInData = false;
if (filename.find ("@") != string::npos) string::size_type pos = filename.find ("@");
if (pos != string::npos)
{ {
vector<string> bigFilePaths; std::string bigFilename = CBigFile::getInstance().getBigFileName(filename.substr(0, pos));
CBigFile::getInstance().getBigFilePaths(bigFilePaths); std::string path = "data/"+filename.substr(0, pos);
if (CBigFile::getInstance().getBigFileName(filename.substr(0, filename.find ("@"))) != "data/"+filename.substr(0, filename.find ("@")))
isInData = false; isInData = bigFilename.find(path) != std::string::npos;
else
isInData = true;
} }
if ((needCheck && !isInData) || !file.open (CPath::lookup(firstFileName))) if ((needCheck && !isInData) || !file.open (CPath::lookup(firstFileName)))
@ -654,10 +653,7 @@ bool CInterfaceParser::parseInterface (const std::vector<std::string> & strings,
if (saveParseResult) if (saveParseResult)
{ {
nlassert(isFilename); nlassert(isFilename);
std::string outputFilename = std::string("data/") + CFile::getFilename(nextFileName) + std::string("_compressed"); std::string outputFilename = CPath::standardizePath("data") + CFile::getFilename(nextFileName) + std::string("_compressed");
#ifdef NL_OS_WINDOWS
outputFilename = CPath::standardizeDosPath(outputFilename);
#endif
COFile f; COFile f;
f.open(outputFilename); f.open(outputFilename);
f.serialCheck(UI_CACHE_SERIAL_CHECK); f.serialCheck(UI_CACHE_SERIAL_CHECK);