diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-10-13 10:16:44 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-10-13 10:16:44 +0200 |
| commit | 32fdf7c38b2e56339a2fffa71a7a61a854759e2c (patch) | |
| tree | 4ad745778dea488ad10509cf17d349c3ef0cc229 /src/openvic-simulation/map/Province.hpp | |
| parent | bb22324da1225a0ac458c1d69893bb3bd28bd6b7 (diff) | |
| parent | d95c3c9da75018e3e959e5493ebd9c520e00bf7a (diff) | |
Merge pull request #50 from OpenVicProject/changes
Lots of accumulated changes
Diffstat (limited to 'src/openvic-simulation/map/Province.hpp')
| -rw-r--r-- | src/openvic-simulation/map/Province.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/openvic-simulation/map/Province.hpp b/src/openvic-simulation/map/Province.hpp index 31b5d4c..d925898 100644 --- a/src/openvic-simulation/map/Province.hpp +++ b/src/openvic-simulation/map/Province.hpp @@ -2,7 +2,7 @@ #include <cassert> -#include "openvic-simulation/map/Building.hpp" +#include "openvic-simulation/economy/Building.hpp" #include "openvic-simulation/pop/Pop.hpp" namespace OpenVic { @@ -55,7 +55,6 @@ namespace OpenVic { fvec2_t navalbase; fixed_point_t navalbase_rotation; }; - static constexpr index_t NULL_INDEX = 0, MAX_INDEX = std::numeric_limits<index_t>::max(); @@ -93,7 +92,7 @@ namespace OpenVic { bool load_positions(BuildingManager const& building_manager, ast::NodeCPtr root); bool add_building(BuildingInstance&& building_instance); - IDENTIFIER_REGISTRY_ACCESSORS(BuildingInstance, building) + IDENTIFIER_REGISTRY_ACCESSORS(building) void reset_buildings(); bool expand_building(std::string_view building_type_identifier); Good const* get_rgo() const; |