diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-09-19 17:40:09 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-09-19 17:40:09 +0200 |
| commit | 9c89100e0c8854dff3174b078d235148585a8b03 (patch) | |
| tree | 77f81dfd3ec85a659741e979c148b33b22595dd0 /src/openvic-simulation/pop/Pop.cpp | |
| parent | 64d134ad20c333afa60373526d6fab27a07c6adc (diff) | |
| parent | 72add97c47f0d17fc0019bb4cfec7506740a9c7d (diff) | |
Merge pull request #17 from OpenVicProject/dataloading-the-third
Scaffolding for `positions.txt` + modifier loading
Diffstat (limited to 'src/openvic-simulation/pop/Pop.cpp')
| -rw-r--r-- | src/openvic-simulation/pop/Pop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp index 1c11b80..8feead9 100644 --- a/src/openvic-simulation/pop/Pop.cpp +++ b/src/openvic-simulation/pop/Pop.cpp @@ -142,8 +142,8 @@ bool PopManager::load_pop_into_province(Province& province, const std::string_vi Pop::pop_size_t size = 0; bool ret = expect_dictionary_keys( - "culture", ONE_EXACTLY, culture_manager.expect_culture(culture), - "religion", ONE_EXACTLY, religion_manager.expect_religion(religion), + "culture", ONE_EXACTLY, culture_manager.expect_culture_identifier(assign_variable_callback_pointer(culture)), + "religion", ONE_EXACTLY, religion_manager.expect_religion_identifier(assign_variable_callback_pointer(religion)), "size", ONE_EXACTLY, expect_uint(assign_variable_callback_uint("pop size", size)), "militancy", ZERO_OR_ONE, success_callback, "rebel_type", ZERO_OR_ONE, success_callback |