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/dataloader/Dataloader.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/dataloader/Dataloader.cpp')
| -rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index f99417f..ee0eaf4 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -562,11 +562,13 @@ bool Dataloader::_load_history(GameManager& game_manager, bool unused_history_fi ret &= apply_to_files( province_history_files, - [this, &game_manager, &province_history_manager, &map, unused_history_file_warnings](fs::path const& file) -> bool { + [this, &game_manager, &province_history_manager, &map, unused_history_file_warnings]( + fs::path const& file + ) -> bool { const std::string filename = file.stem().string(); const std::string_view province_id = extract_basic_identifier_prefix(filename); - Province const* province = map.get_province_by_identifier(province_id); + ProvinceDefinition const* province = map.get_province_definition_by_identifier(province_id); if (province == nullptr) { if (unused_history_file_warnings) { Logger::warning("Found history file for non-existent province: ", province_id); @@ -709,7 +711,7 @@ bool Dataloader::_load_map_dir(GameManager& game_manager) const { bool ret = expect_dictionary_keys( "max_provinces", ONE_EXACTLY, - expect_uint<Province::index_t>(std::bind_front(&Map::set_max_provinces, &map)), + expect_uint<ProvinceDefinition::index_t>(std::bind_front(&Map::set_max_provinces, &map)), "sea_starts", ONE_EXACTLY, expect_list_reserve_length( water_province_identifiers, expect_identifier(vector_callback(water_province_identifiers)) |