diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-06-13 00:52:45 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-06-13 00:52:45 +0200 |
| commit | a49e4d0975e2b5dfd13ae50aa716f1a0307e618d (patch) | |
| tree | f681dd2e76d489ba6e7beea44ae6ebd59e9d51f3 /src/openvic-simulation/map/ProvinceDefinition.hpp | |
| parent | f5d173e88a49a1a9556860063aef1aa287925cfd (diff) | |
| parent | 1198a780916e65cae048dd3478f614c1d18db846 (diff) | |
Merge pull request #162 from OpenVicProject/map-instance
Map instance
Diffstat (limited to 'src/openvic-simulation/map/ProvinceDefinition.hpp')
| -rw-r--r-- | src/openvic-simulation/map/ProvinceDefinition.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/openvic-simulation/map/ProvinceDefinition.hpp b/src/openvic-simulation/map/ProvinceDefinition.hpp index a4076fe..c66323c 100644 --- a/src/openvic-simulation/map/ProvinceDefinition.hpp +++ b/src/openvic-simulation/map/ProvinceDefinition.hpp @@ -11,7 +11,7 @@ namespace OpenVic { - struct Map; + struct MapDefinition; struct Region; struct TerrainType; struct ProvinceSetModifier; @@ -25,7 +25,7 @@ namespace OpenVic { * POP-22 */ struct ProvinceDefinition : HasIdentifierAndColour { - friend struct Map; + friend struct MapDefinition; using index_t = uint16_t; using distance_t = fixed_point_t; // should this go inside adjacency_t? @@ -114,7 +114,9 @@ namespace OpenVic { } /* The positions' y coordinates need to be inverted. */ - bool load_positions(Map const& map, BuildingTypeManager const& building_type_manager, ast::NodeCPtr root); + bool load_positions( + MapDefinition const& map_definition, BuildingTypeManager const& building_type_manager, ast::NodeCPtr root + ); fvec2_t get_text_position() const; fixed_point_t get_text_rotation() const; |