diff options
author | Steve Frampton <40193522+FarmingtonS9@users.noreply.github.com> | 2023-09-16 01:15:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-16 01:15:33 +0200 |
commit | 879b9debfb97c48ed46d777b2a99d71757658cc6 (patch) | |
tree | 87974e84563d08c2f2762b75da0cfb2b4e28eab2 /src/openvic-simulation/map/Province.cpp | |
parent | 6278a35f4704574933464700026d8deb997da5c1 (diff) | |
parent | 8cf93b6523dc380ef0c7215e15e327a78bf4578e (diff) |
Merge pull request #15 from OpenVicProject/more-dataloading
More dataloading
Diffstat (limited to 'src/openvic-simulation/map/Province.cpp')
-rw-r--r-- | src/openvic-simulation/map/Province.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/openvic-simulation/map/Province.cpp b/src/openvic-simulation/map/Province.cpp index f53de3a..49a9bfc 100644 --- a/src/openvic-simulation/map/Province.cpp +++ b/src/openvic-simulation/map/Province.cpp @@ -8,7 +8,7 @@ using namespace OpenVic; using namespace OpenVic::NodeTools; Province::Province(const std::string_view new_identifier, colour_t new_colour, index_t new_index) - : HasIdentifierAndColour { new_identifier, new_colour, false }, + : HasIdentifierAndColour { new_identifier, new_colour, false, false }, index { new_index }, buildings { "buildings", false } { assert(index != NULL_INDEX); @@ -22,7 +22,11 @@ Region* Province::get_region() const { return region; } -bool Province::is_water() const { +bool Province::get_has_region() const { + return has_region; +} + +bool Province::get_water() const { return water; } @@ -64,7 +68,7 @@ bool Province::load_pop_list(PopManager const& pop_manager, ast::NodeCPtr root) } bool Province::add_pop(Pop&& pop) { - if (!is_water()) { + if (!get_water()) { pops.push_back(std::move(pop)); return true; } else { |