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/map/Map.hpp | |
| 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/map/Map.hpp')
| -rw-r--r-- | src/openvic-simulation/map/Map.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/map/Map.hpp b/src/openvic-simulation/map/Map.hpp index f286276..bb760e6 100644 --- a/src/openvic-simulation/map/Map.hpp +++ b/src/openvic-simulation/map/Map.hpp @@ -108,7 +108,7 @@ namespace OpenVic { * that is the maximum allowed number of provinces plus one for the index-zero "null province". */ bool generate_mapmode_colours(Mapmode::index_t index, uint8_t* target) const; - bool reset(BuildingManager const& building_manager); + bool reset(BuildingTypeManager const& building_type_manager); bool apply_history_to_provinces(ProvinceHistoryManager const& history_manager, Date date); void update_highest_province_population(); @@ -120,7 +120,7 @@ namespace OpenVic { void tick(Date today); bool load_province_definitions(std::vector<ovdl::csv::LineObject> const& lines); - bool load_province_positions(BuildingManager const& building_manager, ast::NodeCPtr root); + bool load_province_positions(BuildingTypeManager const& building_type_manager, ast::NodeCPtr root); bool load_region_file(ast::NodeCPtr root); bool load_map_images(fs::path const& province_path, fs::path const& terrain_path, bool detailed_errors); bool generate_and_load_province_adjacencies(std::vector<ovdl::csv::LineObject> const& additional_adjacencies); |