diff options
| author |   zaaarf <80046572+zaaarf@users.noreply.github.com> | 2023-12-27 23:59:44 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-27 23:59:44 +0100 |
| commit | c994cf687ee90879275f917248c0c7c2b25275e2 (patch) | |
| tree | 69ac3c177a57f6091bb07e0d774151a5677dd1cb /src/openvic-simulation/map/Map.hpp | |
| parent | 0d9343e62575b5b7968beea2d36f15541e2351e2 (diff) | |
| parent | 3bf0ce9bfaad1e40ffeeed3d66ca2e628fea8e29 (diff) | |
Merge pull request #108 from OpenVicProject/dataloading-map-climate-continent
Dataloading climate and continents
Diffstat (limited to 'src/openvic-simulation/map/Map.hpp')
| -rw-r--r-- | src/openvic-simulation/map/Map.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/openvic-simulation/map/Map.hpp b/src/openvic-simulation/map/Map.hpp index 523a8e7..2575324 100644 --- a/src/openvic-simulation/map/Map.hpp +++ b/src/openvic-simulation/map/Map.hpp @@ -49,7 +49,6 @@ namespace OpenVic { * MAP-4 */ struct Map { - #pragma pack(push, 1) /* Used to represent tightly packed 3-byte integer pixel information. */ struct shape_pixel_t { @@ -63,6 +62,8 @@ namespace OpenVic { IdentifierRegistry<Province> IDENTIFIER_REGISTRY_CUSTOM_INDEX_OFFSET(province, 1); IdentifierRegistry<Region> IDENTIFIER_REGISTRY(region); IdentifierRegistry<Mapmode> IDENTIFIER_REGISTRY(mapmode); + IdentifierRegistry<Climate> IDENTIFIER_REGISTRY(climate); + IdentifierRegistry<Continent> IDENTIFIER_REGISTRY(continent); ProvinceSet water_provinces; TerrainTypeManager PROPERTY_REF(terrain_type_manager); @@ -132,5 +133,7 @@ namespace OpenVic { 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); + bool load_climate_file(ModifierManager const& modifier_manager, ast::NodeCPtr root); + bool load_continent_file(ModifierManager const& modifier_manager, ast::NodeCPtr root); }; } |