aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/pop/Pop.cpp
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2024-01-02 19:00:56 +0100
committer GitHub <noreply@github.com>2024-01-02 19:00:56 +0100
commitd893c0ad8c6a0c347dcec72762be49f20886a90a (patch)
treee9fd1890c87340d1fc068c671cbd529d12ed6ea3 /src/openvic-simulation/pop/Pop.cpp
parent791e64795a5f688e5ae673b88c5f2787d6450ce8 (diff)
parentab3b2b3e9aa502c7b03d30467b7d2eb682416d90 (diff)
Merge pull request #115 from OpenVicProject/promotion-system
Added pop properties (size changes, literacy)
Diffstat (limited to 'src/openvic-simulation/pop/Pop.cpp')
-rw-r--r--src/openvic-simulation/pop/Pop.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp
index be664d5..dd5bd83 100644
--- a/src/openvic-simulation/pop/Pop.cpp
+++ b/src/openvic-simulation/pop/Pop.cpp
@@ -17,16 +17,13 @@ using namespace OpenVic::NodeTools;
Pop::Pop(
PopType const& new_type, Culture const& new_culture, Religion const& new_religion, pop_size_t new_size,
fixed_point_t new_militancy, fixed_point_t new_consciousness, RebelType const* new_rebel_type
-) : type { new_type }, culture { new_culture }, religion { new_religion }, size { new_size }, num_promoted { 0 },
- num_demoted { 0 }, num_migrated { 0 }, militancy { new_militancy }, consciousness { new_consciousness },
+) : type { new_type }, culture { new_culture }, religion { new_religion }, size { new_size }, num_grown { 0 },
+ num_promoted { 0 }, num_demoted { 0 }, num_migrated_internal { 0 }, num_migrated_external { 0 },
+ num_migrated_colonial { 0 }, militancy { new_militancy }, consciousness { new_consciousness },
rebel_type { new_rebel_type } {
assert(size > 0);
}
-Pop::pop_size_t Pop::get_pop_daily_change() const {
- return Pop::get_num_promoted() - (Pop::get_num_demoted() + Pop::get_num_migrated());
-}
-
Strata::Strata(std::string_view new_identifier) : HasIdentifier { new_identifier } {}
PopType::PopType(