diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-06-13 01:25:21 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-06-13 01:25:21 +0200 |
| commit | 01a8f60aaca9784d814f4cb35a3fc4be86e1dd20 (patch) | |
| tree | ebc9c03b5bd0a6b11068ac37aca302f6ceb24a18 /src/openvic-simulation/map/ProvinceInstance.hpp | |
| parent | a49e4d0975e2b5dfd13ae50aa716f1a0307e618d (diff) | |
| parent | c0ba822ee46551a40ad6b43e8f56b80e27ae35b5 (diff) | |
Merge pull request #163 from OpenVicProject/good-instance
Add GoodInstance
Diffstat (limited to 'src/openvic-simulation/map/ProvinceInstance.hpp')
| -rw-r--r-- | src/openvic-simulation/map/ProvinceInstance.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvic-simulation/map/ProvinceInstance.hpp b/src/openvic-simulation/map/ProvinceInstance.hpp index 3292575..beae0eb 100644 --- a/src/openvic-simulation/map/ProvinceInstance.hpp +++ b/src/openvic-simulation/map/ProvinceInstance.hpp @@ -13,7 +13,7 @@ namespace OpenVic { struct State; struct Country; struct Crime; - struct Good; + struct GoodDefinition; struct ArmyInstance; struct NavyInstance; struct Ideology; @@ -24,7 +24,7 @@ namespace OpenVic { struct IdeologyManager; struct IssueManager; - struct ProvinceInstance : HasIdentifier { + struct ProvinceInstance : HasIdentifierAndColour { friend struct MapInstance; using life_rating_t = int8_t; @@ -44,7 +44,7 @@ namespace OpenVic { bool PROPERTY(slave); Crime const* PROPERTY_RW(crime); // TODO - change this into a factory-like structure - Good const* PROPERTY(rgo); + GoodDefinition const* PROPERTY(rgo); IdentifierRegistry<BuildingInstance> IDENTIFIER_REGISTRY(building); ordered_set<ArmyInstance*> PROPERTY(armies); ordered_set<NavyInstance*> PROPERTY(navies); |