diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-12-07 22:04:05 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-07 22:04:05 +0100 |
| commit | 085fe94212c6f0ddbdfca1b2ba58223e7f6dcc8a (patch) | |
| tree | 2a73255f595eabb1441419a08bd0d5e5407213e7 /src/openvic-simulation/history/CountryHistory.cpp | |
| parent | 48a3f1729d709847d7cad33f594c77cac414e802 (diff) | |
| parent | 398377011cb3d3c970451dcd215f3610159f1ae2 (diff) | |
Merge pull request #85 from OpenVicProject/container-callbacks
Container (pointer) callbacks + format cleanup
Diffstat (limited to 'src/openvic-simulation/history/CountryHistory.cpp')
| -rw-r--r-- | src/openvic-simulation/history/CountryHistory.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/openvic-simulation/history/CountryHistory.cpp b/src/openvic-simulation/history/CountryHistory.cpp index 04a5e09..d312261 100644 --- a/src/openvic-simulation/history/CountryHistory.cpp +++ b/src/openvic-simulation/history/CountryHistory.cpp @@ -59,10 +59,7 @@ bool CountryHistoryMap::_load_history_entry( "primary_culture", ZERO_OR_ONE, culture_manager.expect_culture_identifier(assign_variable_callback_pointer(entry.primary_culture)), "culture", ZERO_OR_MORE, culture_manager.expect_culture_identifier( - [&entry](Culture const& culture) -> bool { - entry.accepted_cultures.push_back(&culture); - return true; - } + vector_callback_pointer(entry.accepted_cultures) ), "religion", ZERO_OR_ONE, game_manager.get_pop_manager().get_religion_manager().expect_religion_identifier( assign_variable_callback_pointer(entry.religion) |