diff options
| author |   BrickPi <49528459+BrickPi@users.noreply.github.com> | 2023-11-15 19:03:02 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-11-15 19:03:02 +0100 |
| commit | a00b558a53edb40c9e6789790036f0b618e80ec1 (patch) | |
| tree | 1100ec41f85e3030d553a3447c1688467c7a8214 /src/openvic-simulation/dataloader | |
| parent | f572664cbe1aa5ec2cb6907de3083f058c20af7e (diff) | |
| parent | 4794eeedd9abc1393526a97253bf9d59b5ecd179 (diff) | |
Merge pull request #76 from OpenVicProject/national-foci
Diffstat (limited to 'src/openvic-simulation/dataloader')
| -rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index 011b524..d36799f 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -843,6 +843,7 @@ bool Dataloader::load_defines(GameManager& game_manager) const { static const std::string graphical_culture_type_file = "common/graphicalculturetype.txt"; static const std::string ideology_file = "common/ideologies.txt"; static const std::string issues_file = "common/issues.txt"; + static const std::string national_foci_file = "common/national_focus.txt"; static const std::string national_values_file = "common/nationalvalues.txt"; static const std::string production_types_file = "common/production_types.txt"; static const std::string religion_file = "common/religion.txt"; @@ -918,6 +919,12 @@ bool Dataloader::load_defines(GameManager& game_manager) const { Logger::error("Failed to load issues!"); ret = false; } + if (!game_manager.get_politics_manager().load_national_foci_file( + game_manager.get_pop_manager(), game_manager.get_economy_manager().get_good_manager(), game_manager.get_modifier_manager(), parse_defines(lookup_file(national_foci_file)).get_file_node() + )) { + Logger::error("Failed to load national foci!"); + ret = false; + } if (!game_manager.get_politics_manager().get_national_value_manager().load_national_values_file( game_manager.get_modifier_manager(), parse_defines(lookup_file(national_values_file)).get_file_node() )) { |