Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge branch 'fastandloose' into 'master'

Browse source 
Drop support for --fs-strict

Closes #7394

See merge request OpenMW/openmw!3093
This commit is contained in:
psi29a 2023-07-02 19:24:14 +00:00
commit 6601b0cb15
47 changed files with 161 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/misc/resourcehelpers.cpp
View file

@ -12,6 +12,7 @@
#include <components/misc/strings/lower.hpp>
#include <components/vfs/manager.hpp>
#include <components/vfs/pathutil.hpp>
namespace
{
@ -168,9 +169,10 @@ std::string Misc::ResourceHelpers::correctSoundPath(std::string_view resPath, co
{
std::string sound{ resPath };
changeExtension(sound, ".mp3");
return vfs->normalizeFilename(sound);
VFS::Path::normalizeFilenameInPlace(sound);
return sound;
}
return vfs->normalizeFilename(resPath);
return VFS::Path::normalizeFilename(resPath);
}
bool Misc::ResourceHelpers::isHiddenMarker(const ESM::RefId& id)
@ -184,7 +186,7 @@ namespace
{
if (auto w = Misc::findExtension(resPath); w != std::string::npos)
resPath.insert(w, pattern);
return vfs->normalizeFilename(resPath);
return VFS::Path::normalizeFilename(resPath);
}
std::string getBestLODMeshName(std::string const& resPath, const VFS::Manager* vfs, std::string_view pattern)