aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/country/Country.hpp
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2024-04-19 20:49:12 +0200
committer GitHub <noreply@github.com>2024-04-19 20:49:12 +0200
commitd0f8ec5484a0ea49d778c0ebb6c2ba2e6df9b7d1 (patch)
tree2e855a0b277f30ea645f88b5107e4253f24ce948 /src/openvic-simulation/country/Country.hpp
parent4dca4f6538a3f82746ca4d8b3e66cdb6f9d0dff6 (diff)
parent4284b73b82c02fb5d2d86fbfd966c03caab8dce4 (diff)
Merge pull request #159 from OpenVicProject/menu-reqs
Menu reqs: country index, flag type set, province set total population
Diffstat (limited to 'src/openvic-simulation/country/Country.hpp')
-rw-r--r--src/openvic-simulation/country/Country.hpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/openvic-simulation/country/Country.hpp b/src/openvic-simulation/country/Country.hpp
index 1d960c2..558b726 100644
--- a/src/openvic-simulation/country/Country.hpp
+++ b/src/openvic-simulation/country/Country.hpp
@@ -48,6 +48,7 @@ namespace OpenVic {
using government_colour_map_t = ordered_map<GovernmentType const*, colour_t>;
private:
+ const size_t PROPERTY(index);
GraphicalCultureType const& PROPERTY(graphical_culture);
/* Not const to allow elements to be moved, otherwise a copy is forced
* which causes a compile error as the copy constructor has been deleted. */
@@ -61,9 +62,9 @@ namespace OpenVic {
// Unit colours not const due to being added after construction
Country(
- std::string_view new_identifier, colour_t new_colour, GraphicalCultureType const& new_graphical_culture,
- IdentifierRegistry<CountryParty>&& new_parties, unit_names_map_t&& new_unit_names, bool new_dynamic_tag,
- government_colour_map_t&& new_alternative_colours,
+ std::string_view new_identifier, colour_t new_colour, size_t new_index,
+ GraphicalCultureType const& new_graphical_culture, IdentifierRegistry<CountryParty>&& new_parties,
+ unit_names_map_t&& new_unit_names, bool new_dynamic_tag, government_colour_map_t&& new_alternative_colours,
colour_t new_primary_unit_colour, colour_t new_secondary_unit_colour, colour_t new_tertiary_unit_colour
);