diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-12-24 13:44:48 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-24 13:44:48 +0100 |
| commit | f036506b88af02508242f279ca29b743ef713976 (patch) | |
| tree | 0fb82e22b383996606ef6adc3e92c42d85bc6777 /src/openvic-simulation/dataloader | |
| parent | 14e47d58b85f657ec1fed8abf88219f09bd3efbb (diff) | |
| parent | 8a33982e543b7fb8c09be90ebadb33fe7f99b52f (diff) | |
Merge pull request #102 from OpenVicProject/tgc-compat
Fixed TGC compatibility + misc cleanup
Diffstat (limited to 'src/openvic-simulation/dataloader')
| -rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index abaaf8b..82f86c6 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -779,18 +779,6 @@ 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() - )) { - Logger::error("Failed to load national values!"); - ret = false; - } if (!game_manager.get_economy_manager().load_production_types_file(game_manager.get_pop_manager(), parse_defines(lookup_file(production_types_file)).get_file_node() )) { @@ -810,6 +798,19 @@ bool Dataloader::load_defines(GameManager& game_manager) const { if (!_load_technologies(game_manager)) { 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() + )) { + Logger::error("Failed to load national values!"); + ret = false; + } if (!game_manager.get_crime_manager().load_crime_modifiers( game_manager.get_modifier_manager(), parse_defines(lookup_file(crime_modifiers_file)).get_file_node() )) { |