aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/country/Country.hpp
diff options
context:
space:
mode:
author hop311 <hop3114@gmail.com>2023-10-29 15:11:10 +0100
committer hop311 <hop3114@gmail.com>2023-10-29 21:08:08 +0100
commit1b5e43fa7750cc4025d32f18390593cbce3ba842 (patch)
treed37fcb69766ec029ea4e3e2816c419f9d7e05f7c /src/openvic-simulation/country/Country.hpp
parent164264b047921dbe1567d2af183e1cffb200a8cb (diff)
Clang-format formatting (with manual cleanup)
Diffstat (limited to 'src/openvic-simulation/country/Country.hpp')
-rw-r--r--src/openvic-simulation/country/Country.hpp23
1 files changed, 6 insertions, 17 deletions
diff --git a/src/openvic-simulation/country/Country.hpp b/src/openvic-simulation/country/Country.hpp
index 8077698..66ce2e6 100644
--- a/src/openvic-simulation/country/Country.hpp
+++ b/src/openvic-simulation/country/Country.hpp
@@ -37,10 +37,7 @@ namespace OpenVic {
const std::vector<Issue const*> policies;
CountryParty(
- std::string_view new_name,
- Date new_start_date,
- Date new_end_date,
- const Ideology& new_ideology,
+ std::string_view new_name, Date new_start_date, Date new_end_date, const Ideology& new_ideology,
std::vector<const Issue*>&& new_policies
);
@@ -77,12 +74,8 @@ namespace OpenVic {
const std::map<const GovernmentType*, colour_t> alternative_colours;
Country(
- std::string_view new_identifier,
- colour_t new_color,
- const GraphicalCultureType& new_graphical_culture,
- std::vector<CountryParty>&& new_parties,
- std::vector<UnitNames>&& new_unit_names,
- const bool new_dynamic_tag,
+ std::string_view new_identifier, colour_t new_color, const GraphicalCultureType& new_graphical_culture,
+ std::vector<CountryParty>&& new_parties, std::vector<UnitNames>&& new_unit_names, const bool new_dynamic_tag,
std::map<const GovernmentType*, colour_t>&& new_alternative_colours
);
@@ -102,16 +95,12 @@ namespace OpenVic {
CountryManager();
bool add_country(
- std::string_view identifier,
- colour_t color,
- const GraphicalCultureType& graphical_culture,
- std::vector<CountryParty>&& parties,
- std::vector<UnitNames>&& unit_names,
- bool dynamic_tag,
+ std::string_view identifier, colour_t color, const GraphicalCultureType& graphical_culture,
+ std::vector<CountryParty>&& parties, std::vector<UnitNames>&& unit_names, bool dynamic_tag,
std::map<const GovernmentType*, colour_t>&& alternative_colours
);
IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(country, countries);
bool load_country_data_file(GameManager& game_manager, std::string_view name, bool is_dynamic, ast::NodeCPtr root);
};
-} \ No newline at end of file
+}