INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-18 10:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add game pattern to search paths

Browse Source
This commit is contained in:
Jan
2022-08-13 20:49:33 +02:00
parent 53bfcadea8
commit 686102a59e
3 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Linker/Linker.cpp
View File

@ -80,11 +80,11 @@ class Linker::Impl
ObjLoading::UnloadIWDsInSearchPath(searchPath);
}
SearchPaths GetAssetSearchPathsForZone(const std::string& zoneName)
SearchPaths GetAssetSearchPathsForZone(const std::string& gameName, const std::string& zoneName)
{
SearchPaths searchPathsForZone;
for (const auto& searchPathStr : m_args.GetAssetSearchPathsForZone(zoneName))
for (const auto& searchPathStr : m_args.GetAssetSearchPathsForZone(gameName, zoneName))
{
auto absolutePath = fs::absolute(searchPathStr);
@ -114,11 +114,11 @@ class Linker::Impl
return searchPathsForZone;
}
SearchPaths GetGdtSearchPathsForZone(const std::string& zoneName)
SearchPaths GetGdtSearchPathsForZone(const std::string& gameName, const std::string& zoneName)
{
SearchPaths searchPathsForZone;
for (const auto& searchPathStr : m_args.GetGdtSearchPathsForZone(zoneName))
for (const auto& searchPathStr : m_args.GetGdtSearchPathsForZone(gameName, zoneName))
{
auto absolutePath = fs::absolute(searchPathStr);
@ -467,14 +467,22 @@ class Linker::Impl
bool BuildZone(const std::string& zoneName)
{
auto assetSearchPaths = GetAssetSearchPathsForZone(zoneName);
auto gdtSearchPaths = GetGdtSearchPathsForZone(zoneName);
auto sourceSearchPaths = GetSourceSearchPathsForZone(zoneName);
const auto zoneDefinition = ReadZoneDefinition(zoneName, &sourceSearchPaths);
if (!zoneDefinition)
return false;
std::string gameName;
if (!GetGameNameFromZoneDefinition(gameName, zoneName, *zoneDefinition))
return false;
for (auto& c : gameName)
c = static_cast<char>(std::tolower(c));
auto assetSearchPaths = GetAssetSearchPathsForZone(gameName, zoneName);
auto gdtSearchPaths = GetGdtSearchPathsForZone(gameName, zoneName);
const auto zone = CreateZoneForDefinition(zoneName, *zoneDefinition, &assetSearchPaths, &gdtSearchPaths, &sourceSearchPaths);
auto result = zone != nullptr;
if (zone)