Add GoodInstancegood-instance

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);