github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Windows path separator issue

Browse source
This commit is contained in:
Random06457 2022-05-06 10:25:39 +09:00
commit 47acc08996
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ZAPDTR/ZAPDUtils/Utils/Directory.h
View file

@ -52,7 +52,7 @@ public:
for (auto& p : fs::recursive_directory_iterator(dir)) for (auto& p : fs::recursive_directory_iterator(dir))
{ {
if (!p.is_directory()) if (!p.is_directory())
lst.push_back(p.path().string()); lst.push_back(p.path().generic_string());
} }
} }

5
libultraship/libultraship/ResourceMgr.cpp
View file

@ -242,12 +242,7 @@ namespace Ship {
} }
std::shared_ptr<ResourcePromise> ResourceMgr::LoadResourceAsync(std::string FilePath) { std::shared_ptr<ResourcePromise> ResourceMgr::LoadResourceAsync(std::string FilePath) {
// todo: what?
#ifdef _WIN32
StringHelper::ReplaceOriginal(FilePath, "/", "\\");
#else
StringHelper::ReplaceOriginal(FilePath, "\\", "/"); StringHelper::ReplaceOriginal(FilePath, "\\", "/");
#endif
if (StringHelper::StartsWith(FilePath, "__OTR__")) if (StringHelper::StartsWith(FilePath, "__OTR__"))
FilePath = StringHelper::Split(FilePath, "__OTR__")[1]; FilePath = StringHelper::Split(FilePath, "__OTR__")[1];