diff options
Diffstat (limited to 'src/openvic-simulation/map/ProvinceInstance.hpp')
| -rw-r--r-- | src/openvic-simulation/map/ProvinceInstance.hpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/openvic-simulation/map/ProvinceInstance.hpp b/src/openvic-simulation/map/ProvinceInstance.hpp index 9899a16..5863a97 100644 --- a/src/openvic-simulation/map/ProvinceInstance.hpp +++ b/src/openvic-simulation/map/ProvinceInstance.hpp @@ -12,6 +12,7 @@ #include "openvic-simulation/types/HasIdentifier.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp" +#include "economy/production/ResourceGatheringOperation.hpp" namespace OpenVic { @@ -74,7 +75,7 @@ namespace OpenVic { bool PROPERTY(slave); Crime const* PROPERTY_RW(crime); - ProductionType const* PROPERTY_RW_ACCESS(rgo_production_type, public); + ResourceGatheringOperation* PROPERTY(rgo); IdentifierRegistry<BuildingInstance> IDENTIFIER_REGISTRY(building); ordered_set<ArmyInstance*> PROPERTY(armies); ordered_set<NavyInstance*> PROPERTY(navies); @@ -115,13 +116,8 @@ namespace OpenVic { return controller; } - GoodDefinition const* get_rgo_good() const { - GoodDefinition const* rgo_good { nullptr }; - if(rgo_production_type != nullptr) { - rgo_good = rgo_production_type->get_output_good(); - } - return rgo_good; - } + GoodDefinition const* get_rgo_good() const; + void set_rgo_production_type(ProductionType const& production_type); bool set_owner(CountryInstance* new_owner); bool set_controller(CountryInstance* new_controller); |