diff options
author | hop311 <hop3114@gmail.com> | 2023-12-02 16:48:08 +0100 |
---|---|---|
committer | hop311 <hop3114@gmail.com> | 2023-12-02 20:14:29 +0100 |
commit | 4a899c1a9e83ab9476b85522751081be434caa35 (patch) | |
tree | f1f6276c91beceecdfd9b09083d1c91ea8b41b60 /src/openvic-simulation/politics/Rebel.hpp | |
parent | cd6875d5e0ca5e2545fd0e1647678cd18a6c81c2 (diff) |
Crime+event modifier loading + misc UI backend
Diffstat (limited to 'src/openvic-simulation/politics/Rebel.hpp')
-rw-r--r-- | src/openvic-simulation/politics/Rebel.hpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/openvic-simulation/politics/Rebel.hpp b/src/openvic-simulation/politics/Rebel.hpp index 791e95b..f012829 100644 --- a/src/openvic-simulation/politics/Rebel.hpp +++ b/src/openvic-simulation/politics/Rebel.hpp @@ -52,13 +52,14 @@ namespace OpenVic { RebelType( std::string_view new_identifier, RebelType::icon_t icon, RebelType::area_t area, bool break_alliance_on_win, - RebelType::government_map_t desired_governments, RebelType::defection_t defection, RebelType::independence_t independence, uint16_t defect_delay, - Ideology const* ideology, bool allow_all_cultures, bool allow_all_culture_groups, bool allow_all_religions, bool allow_all_ideologies, bool resilient, + RebelType::government_map_t&& desired_governments, RebelType::defection_t defection, + RebelType::independence_t independence, uint16_t defect_delay, Ideology const* ideology, bool allow_all_cultures, + bool allow_all_culture_groups, bool allow_all_religions, bool allow_all_ideologies, bool resilient, bool reinforcing, bool general, bool smart, bool unit_transfer, fixed_point_t occupation_mult ); public: - RebelType(RebelType&&) = default; + RebelType(RebelType&&) = default; }; struct RebelManager { @@ -71,11 +72,14 @@ namespace OpenVic { IDENTIFIER_REGISTRY_ACCESSORS(rebel_type) bool add_rebel_type( std::string_view new_identifier, RebelType::icon_t icon, RebelType::area_t area, bool break_alliance_on_win, - RebelType::government_map_t desired_governments, RebelType::defection_t defection, RebelType::independence_t independence, uint16_t defect_delay, - Ideology const* ideology, bool allow_all_cultures, bool allow_all_culture_groups, bool allow_all_religions, bool allow_all_ideologies, bool resilient, + RebelType::government_map_t&& desired_governments, RebelType::defection_t defection, + RebelType::independence_t independence, uint16_t defect_delay, Ideology const* ideology, bool allow_all_cultures, + bool allow_all_culture_groups, bool allow_all_religions, bool allow_all_ideologies, bool resilient, bool reinforcing, bool general, bool smart, bool unit_transfer, fixed_point_t occupation_mult ); - bool load_rebels_file(IdeologyManager const& ideology_manager, GovernmentTypeManager const& government_type_manager, ast::NodeCPtr root); + bool load_rebels_file( + IdeologyManager const& ideology_manager, GovernmentTypeManager const& government_type_manager, ast::NodeCPtr root + ); }; }
\ No newline at end of file |