diff options
| author |   hop311 <hop3114@gmail.com> | 2024-01-18 23:00:51 +0100 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2024-01-18 23:00:51 +0100 |
| commit | 1b6f89f5ba8de2895e05365f8bfbf04e723c9e99 (patch) | |
| tree | 7bdc0eedd116587f5aa10c9f79770f8fee545058 /src/openvic-simulation/military/Wargoal.cpp | |
| parent | b5783116f67c9f7aa9d8d9653e6bda0227f67cd2 (diff) | |
Minor enum cleanup, changed string functions into stream overloads
Diffstat (limited to 'src/openvic-simulation/military/Wargoal.cpp')
| -rw-r--r-- | src/openvic-simulation/military/Wargoal.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvic-simulation/military/Wargoal.cpp b/src/openvic-simulation/military/Wargoal.cpp index 6351ce3..4045fa5 100644 --- a/src/openvic-simulation/military/Wargoal.cpp +++ b/src/openvic-simulation/military/Wargoal.cpp @@ -41,7 +41,7 @@ bool WargoalTypeManager::add_wargoal_type( std::string_view identifier, std::string_view war_name, Timespan available_length, Timespan truce_length, WargoalType::sprite_t sprite_index, bool triggered_only, bool civil_war, bool constructing, bool crisis, bool great_war_obligatory, bool mutual, bool all_allowed_states, - bool always, WargoalType::peace_modifiers_t&& modifiers, peace_options_t peace_options, + bool always, WargoalType::peace_modifiers_t&& modifiers, WargoalType::peace_options_t peace_options, ConditionScript&& can_use, ConditionScript&& is_valid, ConditionScript&& allowed_states, ConditionScript&& allowed_substate_regions, ConditionScript&& allowed_states_in_crisis, ConditionScript&& allowed_countries, EffectScript&& on_add, EffectScript&& on_po_accepted @@ -75,14 +75,14 @@ bool WargoalTypeManager::load_wargoal_file(ast::NodeCPtr root) { return true; } - using enum peace_options_t; + using enum WargoalType::peace_options_t; std::string_view war_name; Timespan available {}, truce {}; WargoalType::sprite_t sprite_index = 0; bool triggered_only = false, civil_war = false, constructing = true, crisis = true, great_war_obligatory = false, mutual = false, all_allowed_states = false, always = false; - peace_options_t peace_options = NO_PEACE_OPTIONS; + WargoalType::peace_options_t peace_options = NO_PEACE_OPTIONS; WargoalType::peace_modifiers_t modifiers; ConditionScript can_use { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::COUNTRY }; ConditionScript is_valid { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::COUNTRY }; @@ -92,7 +92,7 @@ bool WargoalTypeManager::load_wargoal_file(ast::NodeCPtr root) { ConditionScript allowed_countries { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::COUNTRY }; EffectScript on_add, on_po_accepted; //country as default scope for both - const auto expect_peace_option = [&peace_options](peace_options_t peace_option) -> node_callback_t { + const auto expect_peace_option = [&peace_options](WargoalType::peace_options_t peace_option) -> node_callback_t { return expect_bool([&peace_options, peace_option](bool val) -> bool { if (val) { peace_options |= peace_option; |