aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/history/CountryHistory.cpp
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2024-04-15 21:02:06 +0200
committer GitHub <noreply@github.com>2024-04-15 21:02:06 +0200
commitd5d401efb4979011ce07f3dc3f3f5a0a283902fb (patch)
tree5ce0e4d838058305b10bd2b342b16d612b730a40 /src/openvic-simulation/history/CountryHistory.cpp
parenta5695934109559c57eae807a581cdc7f754764c1 (diff)
parentc93cdaf332f82a41272627e90361f40835d9b80a (diff)
Merge pull request #157 from OpenVicProject/pointer-opt
Add std::optional assign pointer callback with overwrite control
Diffstat (limited to 'src/openvic-simulation/history/CountryHistory.cpp')
-rw-r--r--src/openvic-simulation/history/CountryHistory.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/openvic-simulation/history/CountryHistory.cpp b/src/openvic-simulation/history/CountryHistory.cpp
index 5ee5e38..1bd3dd0 100644
--- a/src/openvic-simulation/history/CountryHistory.cpp
+++ b/src/openvic-simulation/history/CountryHistory.cpp
@@ -68,25 +68,25 @@ bool CountryHistoryMap::_load_history_entry(
);
},
"capital", ZERO_OR_ONE,
- game_manager.get_map().expect_province_identifier(assign_variable_callback_pointer(entry.capital)),
+ game_manager.get_map().expect_province_identifier(assign_variable_callback_pointer_opt(entry.capital)),
"primary_culture", ZERO_OR_ONE,
- culture_manager.expect_culture_identifier(assign_variable_callback_pointer(entry.primary_culture)),
+ culture_manager.expect_culture_identifier(assign_variable_callback_pointer_opt(entry.primary_culture)),
"culture", ZERO_OR_MORE, culture_manager.expect_culture_identifier(
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)
+ assign_variable_callback_pointer_opt(entry.religion)
),
"government", ZERO_OR_ONE, politics_manager.get_government_type_manager().expect_government_type_identifier(
- assign_variable_callback_pointer(entry.government_type)
+ assign_variable_callback_pointer_opt(entry.government_type)
),
"plurality", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(entry.plurality)),
"nationalvalue", ZERO_OR_ONE, politics_manager.get_national_value_manager().expect_national_value_identifier(
- assign_variable_callback_pointer(entry.national_value)
+ assign_variable_callback_pointer_opt(entry.national_value)
),
"civilized", ZERO_OR_ONE, expect_bool(assign_variable_callback(entry.civilised)),
"prestige", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(entry.prestige)),
- "ruling_party", ZERO_OR_ONE, country.expect_party_identifier(assign_variable_callback_pointer(entry.ruling_party)),
+ "ruling_party", ZERO_OR_ONE, country.expect_party_identifier(assign_variable_callback_pointer_opt(entry.ruling_party)),
"last_election", ZERO_OR_ONE, expect_date(assign_variable_callback(entry.last_election)),
"upper_house", ZERO_OR_ONE, politics_manager.get_ideology_manager().expect_ideology_dictionary_reserve_length(
entry.upper_house,
@@ -105,7 +105,7 @@ bool CountryHistoryMap::_load_history_entry(
}
),
"schools", ZERO_OR_ONE, technology_manager.expect_technology_school_identifier(
- assign_variable_callback_pointer(entry.tech_school)
+ assign_variable_callback_pointer_opt(entry.tech_school)
),
"foreign_investment", ZERO_OR_ONE,
country_manager.expect_country_decimal_map(move_variable_callback(entry.foreign_investment)),