Merge pull request #163 from OpenVicProject/good-instance

Add GoodInstance

1 files changed, 8 insertions, 5 deletions

diff --git a/src/openvic-simulation/economy/ArtisanalProducer.cpp b/src/openvic-simulation/economy/ArtisanalProducer.cpp
index 52cfa4f..d5cc3d3 100644
--- a/src/openvic-simulation/economy/ArtisanalProducer.cpp
+++ b/src/openvic-simulation/economy/ArtisanalProducer.cpp
@@ -3,8 +3,11 @@
 using namespace OpenVic;
 
 ArtisanalProducer::ArtisanalProducer(
-	ProductionType const& new_production_type, Good::good_map_t&& new_stockpile, const fixed_point_t new_current_production,
-	Good::good_map_t&& new_current_needs
-)
-	: production_type { new_production_type }, stockpile { std::move(new_stockpile) },
-	  current_production { new_current_production }, current_needs { std::move(new_current_needs) } {}
+	ProductionType const& new_production_type,
+	GoodDefinition::good_definition_map_t&& new_stockpile,
+	fixed_point_t new_current_production,
+	GoodDefinition::good_definition_map_t&& new_current_needs
+) : production_type { new_production_type },
+	stockpile { std::move(new_stockpile) },
+	current_production { new_current_production },
+	current_needs { std::move(new_current_needs) } {}