zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from Laupetin/fix/abort-linking-on-load-error

Browse Source 
Abort linking on load error
This commit is contained in:
Jan 2023-10-05 21:39:37 +02:00 committed by GitHub
commit 7850166aba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Linker/Linker.cpp
View File

@ -536,8 +536,8 @@ class Linker::Impl
{ {
if (!fs::is_regular_file(zonePath)) if (!fs::is_regular_file(zonePath))
{ {
printf("Could not find file \"%s\".\n", zonePath.c_str()); std::cout << "Could not find zone file to load \"" << zonePath << "\".\n";
continue; return false;
} }
auto absoluteZoneDirectory = absolute(std::filesystem::path(zonePath).remove_filename()).string(); auto absoluteZoneDirectory = absolute(std::filesystem::path(zonePath).remove_filename()).string();
@ -545,13 +545,13 @@ class Linker::Impl
auto zone = std::unique_ptr<Zone>(ZoneLoading::LoadZone(zonePath)); auto zone = std::unique_ptr<Zone>(ZoneLoading::LoadZone(zonePath));
if (zone == nullptr) if (zone == nullptr)
{ {
printf("Failed to load zone \"%s\".\n", zonePath.c_str()); std::cout << "Failed to load zone \"" << zonePath << "\".\n";
return false; return false;
} }
if (m_args.m_verbose) if (m_args.m_verbose)
{ {
printf("Loaded zone \"%s\"\n", zone->m_name.c_str()); std::cout << "Load zone \"" << zone->m_name << "\"\n";
} }
m_loaded_zones.emplace_back(std::move(zone)); m_loaded_zones.emplace_back(std::move(zone));

2
src/ObjLoading/AssetLoading/AssetLoadingManager.cpp
View File

@ -60,7 +60,7 @@ XAssetInfoGeneric* AssetLoadingManager::LoadIgnoredDependency(const asset_type_t
return lastDependency; return lastDependency;
} }
std::cout << "Failed to create empty asset for type \"" << m_context.m_zone->m_pools->GetAssetTypeName(assetType) << "\"" << std::endl; std::cout << "Failed to create empty asset \"" << assetName << "\" for type \"" << m_context.m_zone->m_pools->GetAssetTypeName(assetType) << "\"" << std::endl;
return nullptr; return nullptr;
} }