From 4284b73b82c02fb5d2d86fbfd966c03caab8dce4 Mon Sep 17 00:00:00 2001 From: hop311 Date: Fri, 19 Apr 2024 19:28:30 +0100 Subject: Menu reqs: country index, flag type set, province set total population --- src/openvic-simulation/map/Region.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/openvic-simulation/map/Region.cpp') diff --git a/src/openvic-simulation/map/Region.cpp b/src/openvic-simulation/map/Region.cpp index c735279..9b31d0f 100644 --- a/src/openvic-simulation/map/Region.cpp +++ b/src/openvic-simulation/map/Region.cpp @@ -95,12 +95,18 @@ ProvinceSet::provinces_t const& ProvinceSet::get_provinces() const { return provinces; } -Region::Region(std::string_view new_identifier, colour_t new_colour, bool new_meta) - : HasIdentifierAndColour { new_identifier, new_colour, false }, meta { new_meta } {} +Pop::pop_size_t ProvinceSet::calculate_total_population() const { + Pop::pop_size_t total_population = 0; + + for (Province const* province : provinces) { + total_population += province->get_total_population(); + } + + return total_population; +} ProvinceSetModifier::ProvinceSetModifier(std::string_view new_identifier, ModifierValue&& new_values) : Modifier { new_identifier, std::move(new_values), 0 } {} -bool Region::get_meta() const { - return meta; -} +Region::Region(std::string_view new_identifier, colour_t new_colour, bool new_meta) + : HasIdentifierAndColour { new_identifier, new_colour, false }, meta { new_meta } {} -- cgit v1.2.3-56-ga3b1