From 3bf0ce9bfaad1e40ffeeed3d66ca2e628fea8e29 Mon Sep 17 00:00:00 2001 From: zaaarf Date: Wed, 27 Dec 2023 23:56:28 +0100 Subject: feat: loading climate.txt and continent.txt --- src/openvic-simulation/map/Map.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/openvic-simulation/map/Map.hpp') 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 IDENTIFIER_REGISTRY_CUSTOM_INDEX_OFFSET(province, 1); IdentifierRegistry IDENTIFIER_REGISTRY(region); IdentifierRegistry IDENTIFIER_REGISTRY(mapmode); + IdentifierRegistry IDENTIFIER_REGISTRY(climate); + IdentifierRegistry 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 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); }; } -- cgit v1.2.3-56-ga3b1