diff options
| author |   Hop311 <hop3114@gmail.com> | 2023-09-18 01:16:05 +0200 |
|---|---|---|
| committer | Hop311 <hop3114@gmail.com> | 2023-09-18 01:16:05 +0200 |
| commit | 72add97c47f0d17fc0019bb4cfec7506740a9c7d (patch) | |
| tree | 77f81dfd3ec85a659741e979c148b33b22595dd0 /src/openvic-simulation/pop | |
| parent | 5549753a6ae909b1a65f52a1cc67ef2b5efae55a (diff) | |
Province adjacency scaffolding
Diffstat (limited to 'src/openvic-simulation/pop')
| -rw-r--r-- | src/openvic-simulation/pop/Culture.cpp | 2 | ||||
| -rw-r--r-- | src/openvic-simulation/pop/Pop.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/openvic-simulation/pop/Culture.cpp b/src/openvic-simulation/pop/Culture.cpp index 7e78b68..dadc0a6 100644 --- a/src/openvic-simulation/pop/Culture.cpp +++ b/src/openvic-simulation/pop/Culture.cpp @@ -130,7 +130,7 @@ bool CultureManager::_load_culture_group(size_t& total_expected_cultures, }, "unit", ZERO_OR_ONE, [this, &total_expected_cultures, &unit_graphical_culture_type](ast::NodeCPtr node) -> bool { total_expected_cultures--; - return expect_graphical_culture_type_identifier(unit_graphical_culture_type)(node); + return expect_graphical_culture_type_identifier(assign_variable_callback_pointer(unit_graphical_culture_type))(node); }, "union", ZERO_OR_ONE, [&total_expected_cultures](ast::NodeCPtr) -> bool { total_expected_cultures--; diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp index 26699c3..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_identifier(culture), - "religion", ONE_EXACTLY, religion_manager.expect_religion_identifier(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 |