diff options
| author |   zaaarf <zaaarf@proton.me> | 2023-09-28 13:16:17 +0200 |
|---|---|---|
| committer | zaaarf <zaaarf@proton.me> | 2023-09-28 13:16:17 +0200 |
| commit | 7a8ac1cdb8e71a4166393ac06b1b60512db0ef8c (patch) | |
| tree | f02b24cd02410fef692b956932b2cb0a09fb9670 /src/openvic-simulation/map/Province.hpp | |
| parent | 33a2a1e5fcac60ddd0f2840449488e48069493ec (diff) | |
feat: renamed Building to BuildingInstance, implemented Building and BuildingType defines
Diffstat (limited to 'src/openvic-simulation/map/Province.hpp')
| -rw-r--r-- | src/openvic-simulation/map/Province.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvic-simulation/map/Province.hpp b/src/openvic-simulation/map/Province.hpp index 6e4ac7e..349c16d 100644 --- a/src/openvic-simulation/map/Province.hpp +++ b/src/openvic-simulation/map/Province.hpp @@ -1,6 +1,6 @@ #pragma once -#include <limits> +#include <cassert> #include "openvic-simulation/map/Building.hpp" #include "openvic-simulation/pop/Pop.hpp" @@ -46,7 +46,7 @@ namespace OpenVic { Region* region = nullptr; bool has_region = false, water = false; life_rating_t life_rating = 0; - IdentifierRegistry<Building> buildings; + IdentifierRegistry<BuildingInstance> buildings; // TODO - change this into a factory-like structure Good const* rgo = nullptr; @@ -73,8 +73,8 @@ namespace OpenVic { life_rating_t get_life_rating() const; bool load_positions(BuildingManager const& building_manager, ast::NodeCPtr root); - bool add_building(Building&& building); - IDENTIFIER_REGISTRY_ACCESSORS(Building, building) + bool add_building(BuildingInstance&& building_instance); + IDENTIFIER_REGISTRY_ACCESSORS(BuildingInstance, building) void reset_buildings(); bool expand_building(const std::string_view building_type_identifier); Good const* get_rgo() const; |