From 0d66aff6437f7c6f856c11bc2cc6d6b888d28c98 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Wed, 9 Feb 2011 14:42:30 +0100
Subject: [PATCH] Changed: #878 Fix typos in comments/code

---
 code/nel/include/nel/misc/stream_inline.h      |  2 +-
 .../src/interface_v3/interface_parser.cpp      | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/code/nel/include/nel/misc/stream_inline.h b/code/nel/include/nel/misc/stream_inline.h
index 6ae5b7a3c..20e817da2 100644
--- a/code/nel/include/nel/misc/stream_inline.h
+++ b/code/nel/include/nel/misc/stream_inline.h
@@ -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())
diff --git a/code/ryzom/client/src/interface_v3/interface_parser.cpp b/code/ryzom/client/src/interface_v3/interface_parser.cpp
index b874b709e..a6e0776cc 100644
--- a/code/ryzom/client/src/interface_v3/interface_parser.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_parser.cpp
@@ -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);