diff options
| author |   hop311 <hop3114@gmail.com> | 2023-10-31 02:11:47 +0100 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2023-11-07 19:33:42 +0100 |
| commit | c1b7cab254ac14a173477661047ad2492930ff8b (patch) | |
| tree | 3fd965559fb97c7a2f2245952ab531afec84bc93 /src/openvic-simulation/politics | |
| parent | e91ce707b2c0e80591b9fd1b6a5215e6e6989df8 (diff) | |
History loading changes + PROPERTY macro
Diffstat (limited to 'src/openvic-simulation/politics')
| -rw-r--r-- | src/openvic-simulation/politics/Government.cpp | 2 | ||||
| -rw-r--r-- | src/openvic-simulation/politics/Ideology.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/politics/Government.cpp b/src/openvic-simulation/politics/Government.cpp index 823284a..3b0f28d 100644 --- a/src/openvic-simulation/politics/Government.cpp +++ b/src/openvic-simulation/politics/Government.cpp @@ -85,7 +85,7 @@ bool GovernmentTypeManager::load_government_types_file(IdeologyManager const& id [this, &ideology_manager, &ideologies, government_type_identifier]( std::string_view key, ast::NodeCPtr value) -> bool { static const string_set_t reserved_keys = { "election", "duration", "appoint_ruling_party", "flagType" }; - if (reserved_keys.find(key) != reserved_keys.end()) { + if (reserved_keys.contains(key)) { return true; } Ideology const* ideology = ideology_manager.get_ideology_by_identifier(key); diff --git a/src/openvic-simulation/politics/Ideology.cpp b/src/openvic-simulation/politics/Ideology.cpp index 5721a57..148d6ac 100644 --- a/src/openvic-simulation/politics/Ideology.cpp +++ b/src/openvic-simulation/politics/Ideology.cpp @@ -8,7 +8,7 @@ IdeologyGroup::IdeologyGroup(std::string_view new_identifier) : HasIdentifier { Ideology::Ideology( std::string_view new_identifier, colour_t new_colour, IdeologyGroup const& new_group, bool new_uncivilised, bool new_can_reduce_militancy, Date new_spawn_date -) : HasIdentifierAndColour { new_identifier, new_colour, true, false }, group { new_group }, uncivilised { new_uncivilised }, +) : HasIdentifierAndColour { new_identifier, new_colour, false, false }, group { new_group }, uncivilised { new_uncivilised }, can_reduce_militancy { new_can_reduce_militancy }, spawn_date { new_spawn_date } {} IdeologyGroup const& Ideology::get_group() const { |