diff options
| author |   hop311 <hop3114@gmail.com> | 2023-12-06 23:10:53 +0100 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2023-12-07 21:38:17 +0100 |
| commit | 398377011cb3d3c970451dcd215f3610159f1ae2 (patch) | |
| tree | 2a73255f595eabb1441419a08bd0d5e5407213e7 /src/openvic-simulation/politics | |
| parent | 48a3f1729d709847d7cad33f594c77cac414e802 (diff) | |
Vec/set callbacks + crime file + prov building pos
Diffstat (limited to 'src/openvic-simulation/politics')
| -rw-r--r-- | src/openvic-simulation/politics/Government.cpp | 2 | ||||
| -rw-r--r-- | src/openvic-simulation/politics/NationalFocus.hpp | 2 | ||||
| -rw-r--r-- | src/openvic-simulation/politics/PoliticsManager.hpp | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/openvic-simulation/politics/Government.cpp b/src/openvic-simulation/politics/Government.cpp index 609e75f..b18432c 100644 --- a/src/openvic-simulation/politics/Government.cpp +++ b/src/openvic-simulation/politics/Government.cpp @@ -41,7 +41,7 @@ bool GovernmentTypeManager::add_government_type( identifier, std::move(ideologies), elections, appoint_ruling_party, term_duration, flag_type }); - /* flag_type can be empty here for default/non-ideological flag */ + /* flag_type can be empty here for default/non-ideological flag */ if (ret && std::find(flag_types.begin(), flag_types.end(), flag_type) == flag_types.end()) { flag_types.emplace_back(flag_type); } diff --git a/src/openvic-simulation/politics/NationalFocus.hpp b/src/openvic-simulation/politics/NationalFocus.hpp index 396f8ec..abf6deb 100644 --- a/src/openvic-simulation/politics/NationalFocus.hpp +++ b/src/openvic-simulation/politics/NationalFocus.hpp @@ -69,7 +69,7 @@ namespace OpenVic { NationalFocus::party_loyalty_map_t&& encouraged_loyalty, NationalFocus::production_map_t&& encouraged_production ); - IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(national_focus, national_foci); + IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(national_focus, national_foci) bool load_national_foci_file(PopManager const& pop_manager, IdeologyManager const& ideology_manager, GoodManager const& good_manager, ModifierManager const& modifier_manager, ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/politics/PoliticsManager.hpp b/src/openvic-simulation/politics/PoliticsManager.hpp index 0afe002..1111f0a 100644 --- a/src/openvic-simulation/politics/PoliticsManager.hpp +++ b/src/openvic-simulation/politics/PoliticsManager.hpp @@ -1,11 +1,11 @@ #pragma once -#include "Rebel.hpp" #include "openvic-simulation/politics/Government.hpp" #include "openvic-simulation/politics/Ideology.hpp" #include "openvic-simulation/politics/Issue.hpp" -#include "openvic-simulation/politics/NationalValue.hpp" #include "openvic-simulation/politics/NationalFocus.hpp" +#include "openvic-simulation/politics/NationalValue.hpp" +#include "openvic-simulation/politics/Rebel.hpp" namespace OpenVic { struct PoliticsManager { @@ -21,7 +21,10 @@ namespace OpenVic { inline bool load_government_types_file(ast::NodeCPtr root) { return government_type_manager.load_government_types_file(ideology_manager, root); } - inline bool load_national_foci_file(PopManager const& pop_manager, GoodManager const& good_manager, ModifierManager const& modifier_manager, ast::NodeCPtr root) { + inline bool load_national_foci_file( + PopManager const& pop_manager, GoodManager const& good_manager, ModifierManager const& modifier_manager, + ast::NodeCPtr root + ) { return national_focus_manager.load_national_foci_file(pop_manager, ideology_manager, good_manager, modifier_manager, root); } inline bool load_rebels_file(ast::NodeCPtr root) { |