From 43610b381d18845cbbf20d467cfd87504f59941b Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 28 Dec 2021 19:40:39 +0100 Subject: [PATCH] Reduce menu reading console output on successful read --- .../IW4/AssetLoaders/AssetLoaderMenuList.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.cpp index c5842988..3659f3f1 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.cpp @@ -59,19 +59,14 @@ void AssetLoaderMenuList::AddResultsToZoneState(menu::ParsingResult* parsingResu bool AssetLoaderMenuList::ProcessParsedResults(const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, menu::ParsingResult* parsingResult, menu::MenuAssetZoneState* zoneState, std::vector& menus, std::vector& menuListDependencies) { - std::cout << "Successfully read menu list \"" << assetName << "\":\n"; - - std::cout << " " << parsingResult->m_menus_to_load.size() << " menus to load:\n"; - for (const auto& menuToLoad : parsingResult->m_menus_to_load) - std::cout << " " << menuToLoad << "\n"; - - std::cout << " " << parsingResult->m_menus.size() << " menus:\n"; + const auto menuCount = parsingResult->m_menus.size(); + const auto functionCount = parsingResult->m_functions.size(); + const auto menuLoadCount = parsingResult->m_menus_to_load.size(); + auto totalItemCount = 0u; for (const auto& menu : parsingResult->m_menus) - std::cout << " " << menu->m_name << " (" << menu->m_items.size() << " items)\n"; + totalItemCount += menu->m_items.size(); - std::cout << " " << parsingResult->m_functions.size() << " functions:\n"; - for (const auto& function : parsingResult->m_functions) - std::cout << " " << function->m_name << "\n"; + std::cout << "Successfully read menu file \"" << assetName << "\" (" << menuLoadCount << " loads, " << menuCount << " menus, " << functionCount << " functions, " << totalItemCount << " items)\n"; for (const auto& menu : parsingResult->m_menus) { @@ -151,7 +146,7 @@ bool AssetLoaderMenuList::LoadFromRaw(const std::string& assetName, ISearchPath* AddMenuFilesToLoadToQueue(menuFileQueue, menuFileResult.get(), zoneState); } else - std::cout << "Could not read menu list \"" << nextMenuFile << "\"\n"; + std::cout << "Could not read menu file \"" << nextMenuFile << "\"\n"; menuFileQueue.pop_front(); }