bugfix(filesystem): Use native separators in archive listings

Author: bobtista

Core/GameEngine/Source/Common/System/ArchiveFile.cpp

@@ -29,6 +29,7 @@
 #include "PreRTS.h"
 
 #include "Common/ArchiveFile.h"
+#include "Common/FileSystem.h"
 #include "Common/ArchiveFileSystem.h"
 #include "Common/LocalFileSystem.h"
 #include "Common/file.h"
@@ -154,9 +155,7 @@ void ArchiveFile::getFileListInDirectory(const DetailedArchivedDirectoryInfo *di
 	for (; diriter != dirInfo->m_directories.end(); ++diriter) {
 		const DetailedArchivedDirectoryInfo *tempDirInfo = &(diriter->second);
 		AsciiString tempDirName = currentDirectory;
-		if (!tempDirName.isEmpty() && !tempDirName.endsWith("\\")) {
-			tempDirName.concat('\\');
-		}
+		FileSystem::appendPathSeparator(tempDirName);
 		tempDirName.concat(tempDirInfo->m_directoryName);
 		getFileListInDirectory(tempDirInfo, tempDirName, searchName, filenameList, searchSubdirectories);
 	}
@@ -167,9 +166,7 @@ void ArchiveFile::getFileListInDirectory(const DetailedArchivedDirectoryInfo *di
 		if (SearchStringMatches(fileInfo.m_filename, searchName)) {
 			AsciiString tempfilename;
 			tempfilename = currentDirectory;
-			if (!tempfilename.isEmpty() && !tempfilename.endsWith("\\")) {
-				tempfilename.concat('\\');
-			}
+			FileSystem::appendPathSeparator(tempfilename);
 			tempfilename.concat(fileInfo.m_filename);
 			if (filenameList.find(tempfilename) == filenameList.end()) {
 				// only insert into the list if its not already in there.

Core/GameEngine/Source/GameClient/MapUtil.cpp

@@ -533,11 +533,10 @@ Bool MapCache::loadMapsFromDisk( const AsciiString &mapDir, Bool isOfficial, Boo
 		const char *szFilenameLower = getLastPathSeparator(filepathLower.str());
 		if (!szFilenameLower)
 		{
-			DEBUG_CRASH(("Couldn't find \\ in map name!"));
+			DEBUG_CRASH(("Couldn't find path separator in map name!"));
 			continue;
 		}
 
-		AsciiString endingStr;
 		AsciiString filenameLower = szFilenameLower+1;
 		filenameLower.truncateBy(strlen(mapExtension));
 
@@ -547,7 +546,8 @@ Bool MapCache::loadMapsFromDisk( const AsciiString &mapDir, Bool isOfficial, Boo
 			continue;
 		}
 
-		endingStr.format("%s\\%s%s", filenameLower.str(), filenameLower.str(), mapExtension);
+		AsciiString endingStr;
+		endingStr.format("%s%c%s%s", filenameLower.str(), *szFilenameLower, filenameLower.str(), mapExtension);
 
 		if (!filepathLower.endsWithNoCase(endingStr.str()))
 		{