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

Merge branch 'main' into bsp-compilation

Browse Source
This commit is contained in:
LJW-Dev
2025-11-04 14:20:37 +08:00
parent b7162d6290 69143d80fb
commit e88f064172
317 changed files with 6511 additions and 1998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Linker/Linker.cpp
View File

@@ -363,14 +363,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, std::nullopt);
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));
}

2
src/Linker/ZoneCreation/ZoneCreator.cpp
View File

@@ -11,7 +11,7 @@ namespace
{
std::unique_ptr<Zone> CreateZone(const ZoneCreationContext& context, const GameId gameId)
{
return std::make_unique<Zone>(context.m_definition->m_name, 0, gameId);
return std::make_unique<Zone>(context.m_definition->m_name, 0, gameId, GamePlatform::PC);
}
std::vector<Gdt*> CreateGdtList(const ZoneCreationContext& context)