thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-27 21:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge only archives.

Browse source
This commit is contained in:
Skyth 2024-12-29 15:41:11 +03:00
parent 8b51f81cee
commit 2a2437789d
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
UnleashedRecomp/mod/mod_loader.cpp
View file

@ -43,9 +43,14 @@ std::filesystem::path ModLoader::RedirectPath(std::string_view path)
std::replace(pathStr.begin(), pathStr.end(), '\\', '/'); std::replace(pathStr.begin(), pathStr.end(), '\\', '/');
std::filesystem::path fsPath(std::move(pathStr)); std::filesystem::path fsPath(std::move(pathStr));
bool canBeMerged =
path.find(".arl") == (path.size() - 4) ||
path.find(".ar.") == (path.size() - 6) ||
path.find(".ar") == (path.size() - 3);
for (auto& mod : g_mods) for (auto& mod : g_mods)
{ {
if (mod.type == ModType::UMM && mod.merge && !mod.readOnly.contains(fsPath)) if (mod.type == ModType::UMM && mod.merge && canBeMerged && !mod.readOnly.contains(fsPath))
continue; continue;
for (auto& includeDir : mod.includeDirs) for (auto& includeDir : mod.includeDirs)