Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-11 13:06:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 24

Use normalized path for correctActorModelPath

Browse source
This commit is contained in:
elsid 2024-10-19 14:07:47 +02:00
parent 376911f645
commit afa769408a
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
10 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/misc/resourcehelpers.cpp
View file

@ -142,22 +142,23 @@ std::string Misc::ResourceHelpers::correctBookartPath(
return image;
}
std::string Misc::ResourceHelpers::correctActorModelPath(std::string_view resPath, const VFS::Manager* vfs)
VFS::Path::Normalized Misc::ResourceHelpers::correctActorModelPath(
VFS::Path::NormalizedView resPath, const VFS::Manager* vfs)
{
std::string mdlname(resPath);
std::string::size_type p = mdlname.find_last_of("/\\");
std::string mdlname(resPath.value());
std::string::size_type p = mdlname.find_last_of('/');
if (p != std::string::npos)
mdlname.insert(mdlname.begin() + p + 1, 'x');
mdlname.insert(mdlname.begin() + static_cast<std::string::difference_type>(p) + 1, 'x');
else
mdlname.insert(mdlname.begin(), 'x');
std::string kfname = mdlname;
if (Misc::StringUtils::ciEndsWith(kfname, ".nif"))
kfname.replace(kfname.size() - 4, 4, ".kf");
VFS::Path::Normalized kfname(mdlname);
if (Misc::getFileExtension(mdlname) == "nif")
kfname.changeExtension("kf");
if (!vfs->exists(kfname))
{
return std::string(resPath);
}
return VFS::Path::Normalized(resPath);
return mdlname;
}

2
components/misc/resourcehelpers.hpp
View file

@ -33,7 +33,7 @@ namespace Misc
std::string correctBookartPath(std::string_view resPath, int width, int height, const VFS::Manager* vfs);
/// Use "xfoo.nif" instead of "foo.nif" if "xfoo.kf" is available
/// Note that if "xfoo.nif" is actually unavailable, we can't fall back to "foo.nif". :(
std::string correctActorModelPath(std::string_view resPath, const VFS::Manager* vfs);
VFS::Path::Normalized correctActorModelPath(VFS::Path::NormalizedView resPath, const VFS::Manager* vfs);
std::string correctMaterialPath(std::string_view resPath, const VFS::Manager* vfs);
// Adds "meshes\\".