From 47acc08996f199b358815a192930b4329da7b753 Mon Sep 17 00:00:00 2001 From: Random06457 <28494085+Random06457@users.noreply.github.com> Date: Fri, 6 May 2022 10:25:39 +0900 Subject: [PATCH] Fix Windows path separator issue --- ZAPDTR/ZAPDUtils/Utils/Directory.h | 2 +- libultraship/libultraship/ResourceMgr.cpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ZAPDTR/ZAPDUtils/Utils/Directory.h b/ZAPDTR/ZAPDUtils/Utils/Directory.h index b1ce49699..1ced139be 100644 --- a/ZAPDTR/ZAPDUtils/Utils/Directory.h +++ b/ZAPDTR/ZAPDUtils/Utils/Directory.h @@ -52,7 +52,7 @@ public: for (auto& p : fs::recursive_directory_iterator(dir)) { if (!p.is_directory()) - lst.push_back(p.path().string()); + lst.push_back(p.path().generic_string()); } } diff --git a/libultraship/libultraship/ResourceMgr.cpp b/libultraship/libultraship/ResourceMgr.cpp index fb510de0a..de0296d12 100644 --- a/libultraship/libultraship/ResourceMgr.cpp +++ b/libultraship/libultraship/ResourceMgr.cpp @@ -242,12 +242,7 @@ namespace Ship { } std::shared_ptr ResourceMgr::LoadResourceAsync(std::string FilePath) { - // todo: what? -#ifdef _WIN32 - StringHelper::ReplaceOriginal(FilePath, "/", "\\"); -#else StringHelper::ReplaceOriginal(FilePath, "\\", "/"); -#endif if (StringHelper::StartsWith(FilePath, "__OTR__")) FilePath = StringHelper::Split(FilePath, "__OTR__")[1];