diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-06-06 21:29:15 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-06-06 21:29:15 +0200 |
| commit | f5d173e88a49a1a9556860063aef1aa287925cfd (patch) | |
| tree | f3a9a107f1bd4b6b6d8035a96ac659bcc15f176b /src/openvic-simulation/history/CountryHistory.cpp | |
| parent | e286cfef29d7c431ba33cd77283e838e6fba05d2 (diff) | |
| parent | 37cdd775ac738b2a1264e32471385376e5a34f3a (diff) | |
Merge pull request #161 from OpenVicProject/const-mutable
Province const/mutable separation + State cleanup
Diffstat (limited to 'src/openvic-simulation/history/CountryHistory.cpp')
| -rw-r--r-- | src/openvic-simulation/history/CountryHistory.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/openvic-simulation/history/CountryHistory.cpp b/src/openvic-simulation/history/CountryHistory.cpp index 1bd3dd0..90fe995 100644 --- a/src/openvic-simulation/history/CountryHistory.cpp +++ b/src/openvic-simulation/history/CountryHistory.cpp @@ -68,7 +68,7 @@ bool CountryHistoryMap::_load_history_entry( ); }, "capital", ZERO_OR_ONE, - game_manager.get_map().expect_province_identifier(assign_variable_callback_pointer_opt(entry.capital)), + game_manager.get_map().expect_province_definition_identifier(assign_variable_callback_pointer_opt(entry.capital)), "primary_culture", ZERO_OR_ONE, culture_manager.expect_culture_identifier(assign_variable_callback_pointer_opt(entry.primary_culture)), "culture", ZERO_OR_MORE, culture_manager.expect_culture_identifier( @@ -148,7 +148,9 @@ bool CountryHistoryMap::_load_history_entry( /* If the first government type is null, the "government" section will have already output * an error, so no need to output another one here. */ if (government_type != nullptr && flag_override_government_type != nullptr) { - ret &= map_callback(entry.government_flag_overrides, government_type)(flag_override_government_type); + ret &= map_callback( + entry.government_flag_overrides, government_type)(flag_override_government_type + ); } return ret; } else { |