From 35c6417af51e919194043af65870420656f48ae3 Mon Sep 17 00:00:00 2001 From: hop311 Date: Sat, 2 Mar 2024 00:21:07 +0000 Subject: Cleaned up tech loading and added tech lists for areas --- src/openvic-simulation/dataloader/Dataloader.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/openvic-simulation/dataloader') diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index b7ccba3..9df9725 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -426,15 +426,15 @@ bool Dataloader::_load_technologies(GameManager& game_manager) { const v2script::Parser technology_file_parser = parse_defines(lookup_file(technology_file)); - if (!technology_manager.load_technology_file_areas(technology_file_parser.get_file_node())) { - Logger::error("Failed to load technology areas and folders!"); + if (!technology_manager.load_technology_file_folders_and_areas(technology_file_parser.get_file_node())) { + Logger::error("Failed to load technology folders and areas!"); ret = false; } ModifierManager& modifier_manager = game_manager.get_modifier_manager(); if (!technology_manager.generate_modifiers(modifier_manager)) { - Logger::error("Failed to generate technollogy-based modifiers!"); + Logger::error("Failed to generate technology-based modifiers!"); ret = false; } @@ -460,6 +460,9 @@ bool Dataloader::_load_technologies(GameManager& game_manager) { } technology_manager.lock_technologies(); + + ret &= technology_manager.generate_technology_lists(); + return ret; } -- cgit v1.2.3-56-ga3b1