miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: use std::string_view for FS2OTTD and OTTD2FS

Browse Source
This commit is contained in:
Rubidium
2025-04-29 21:00:06 +02:00
committed by rubidium42
parent ef71ce0a9d
commit f4ad614285
10 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fileio.cpp
View File

@@ -475,7 +475,7 @@ bool TarScanner::AddFile(const std::string &filename, size_t, [[maybe_unused]] c
_tar_list[this->subdir][filename] = std::string{};
std::string filename_base = FS2OTTD(std::filesystem::path(OTTD2FS(filename)).filename());
std::string filename_base = FS2OTTD(std::filesystem::path(OTTD2FS(filename)).filename().native());
SimplifyFileName(filename_base);
TarHeader th;
@@ -822,7 +822,7 @@ void DetermineBasePaths(std::string_view exe)
/* _config_file is not in a folder, so use current directory. */
tmp = cwd;
} else {
tmp = FS2OTTD(std::filesystem::weakly_canonical(std::filesystem::path(OTTD2FS(_config_file))).parent_path());
tmp = FS2OTTD(std::filesystem::weakly_canonical(std::filesystem::path(OTTD2FS(_config_file))).parent_path().native());
}
AppendPathSeparator(tmp);
_searchpaths[SP_WORKING_DIR] = tmp;
@@ -1074,7 +1074,7 @@ static uint ScanPath(FileScanner *fs, std::string_view extension, const std::fil
if (!recursive) continue;
num += ScanPath(fs, extension, dir_entry.path(), basepath_length, recursive);
} else if (dir_entry.is_regular_file()) {
std::string file = FS2OTTD(dir_entry.path());
std::string file = FS2OTTD(dir_entry.path().native());
if (!MatchesExtension(extension, file)) continue;
if (fs->AddFile(file, basepath_length, {})) num++;
}