diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-04-19 20:49:12 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-04-19 20:49:12 +0200 |
| commit | d0f8ec5484a0ea49d778c0ebb6c2ba2e6df9b7d1 (patch) | |
| tree | 2e855a0b277f30ea645f88b5107e4253f24ce948 /src/openvic-simulation/map/Region.hpp | |
| parent | 4dca4f6538a3f82746ca4d8b3e66cdb6f9d0dff6 (diff) | |
| parent | 4284b73b82c02fb5d2d86fbfd966c03caab8dce4 (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/map/Region.hpp')
| -rw-r--r-- | src/openvic-simulation/map/Region.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/openvic-simulation/map/Region.hpp b/src/openvic-simulation/map/Region.hpp index 420d221..f12e14a 100644 --- a/src/openvic-simulation/map/Region.hpp +++ b/src/openvic-simulation/map/Region.hpp @@ -26,6 +26,7 @@ namespace OpenVic { void reserve_more(size_t size); bool contains_province(Province const* province) const; provinces_t const& get_provinces() const; + Pop::pop_size_t calculate_total_population() const; }; struct ProvinceSetModifier : Modifier, ProvinceSet { @@ -47,13 +48,11 @@ namespace OpenVic { * Any region containing a province already listed in a * previously defined region is considered a meta region. */ - const bool meta; + const bool PROPERTY(meta); Region(std::string_view new_identifier, colour_t new_colour, bool new_meta); public: Region(Region&&) = default; - - bool get_meta() const; }; } |