From 6c477193510b4476e09b6ceac6d4a1c941363077 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 31 Jan 2024 15:25:59 +0300 Subject: [PATCH] EnginePaths::resolve encoding fix --- src/files/engine_paths.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp index a657a3ca..c536c2a0 100644 --- a/src/files/engine_paths.cpp +++ b/src/files/engine_paths.cpp @@ -91,31 +91,31 @@ void EnginePaths::setContentPacks(std::vector* contentPacks) { fs::path EnginePaths::resolve(std::string path) { size_t separator = path.find(':'); if (separator == std::string::npos) { - return fs::path(path); + return fs::u8path(path); } std::string prefix = path.substr(0, separator); std::string filename = path.substr(separator+1); if (prefix == "res" || prefix == "core") { - return resources/fs::path(filename); + return resources/fs::u8path(filename); } if (prefix == "user") { - return userfiles/fs::path(filename); + return userfiles/fs::u8path(filename); } if (prefix == "world") { - return worldFolder/fs::path(filename); + return worldFolder/fs::u8path(filename); } if (contentPacks) { for (auto& pack : *contentPacks) { if (pack.id == prefix) { - return pack.folder/fs::path(filename); + return pack.folder/fs::u8path(filename); } } } - return fs::path("./"+filename); + return fs::u8path("./"+filename); } ResPaths::ResPaths(fs::path mainRoot, std::vector roots)