mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1674

Browse source
This commit is contained in:
scrawl 2018-04-18 15:56:22 +00:00
commit ce1b2a612c
No known key found for this signature in database
GPG key ID: 2E6CC3676024C402
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
components/misc/resourcehelpers.cpp
View file

@ -63,28 +63,16 @@ std::string Misc::ResourceHelpers::correctResourcePath(const std::string &topLev
std::string origExt = correctedPath; std::string origExt = correctedPath;
// since we know all (GOTY edition or less) textures end if (vfs->exists(origExt)
// in .dds, we change the extension || (changeExtensionToDds(correctedPath) && vfs->exists(correctedPath)))
bool changedToDds = changeExtensionToDds(correctedPath);
if (vfs->exists(correctedPath))
return correctedPath; return correctedPath;
// if it turns out that the above wasn't true in all cases (not for vanilla, but maybe mods)
// verify, and revert if false (this call succeeds quickly, but fails slowly)
if (changedToDds && vfs->exists(origExt))
return origExt;
// fall back to a resource in the top level directory if it exists // fall back to a resource in the top level directory if it exists
std::string fallback = topLevelDirectory + "\\" + getBasename(correctedPath); std::string fallback = topLevelDirectory + "\\" + getBasename(origExt);
if (vfs->exists(fallback)) if (vfs->exists(fallback)
|| (changeExtensionToDds(fallback) && vfs->exists(fallback)))
return fallback; return fallback;
if (changedToDds)
{
fallback = topLevelDirectory + "\\" + getBasename(origExt);
if (vfs->exists(fallback))
return fallback;
}
return correctedPath; return correctedPath;
} }