zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-12-02 17:27:47 +00:00
Code Activity

chore: pass ZoneLoading error as result

Browse Source
This commit is contained in:
Jan Laupetin
2025-10-11 15:28:19 +01:00
parent 098be53559
commit b27b7e77bd
9 changed files with 181 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Linker/Linker.cpp
View File

@@ -364,14 +364,16 @@ class LinkerImpl final : public Linker
zoneDirectory = fs::current_path();
auto absoluteZoneDirectory = absolute(zoneDirectory).string();
auto zone = ZoneLoading::LoadZone(zonePath);
if (!zone)
auto maybeZone = ZoneLoading::LoadZone(zonePath);
if (!maybeZone)
{
con::error("Failed to load zone \"{}\".", zonePath);
con::error("Failed to load zone \"{}\": {}", zonePath, maybeZone.error());
return false;
}
con::debug("Load zone \"{}\"", zone->m_name);
auto zone = std::move(*maybeZone);
con::debug("Loaded zone \"{}\"", zone->m_name);
m_loaded_zones.emplace_back(std::move(zone));
}