diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/headless/main.cpp | 27 | ||||
| -rw-r--r-- | src/openvic-simulation/economy/production/ProductionType.cpp | 4 | ||||
| -rw-r--r-- | src/openvic-simulation/economy/production/ProductionType.hpp | 4 | ||||
| -rw-r--r-- | src/openvic-simulation/map/ProvinceInstance.cpp | 2 |
4 files changed, 14 insertions, 23 deletions
diff --git a/src/headless/main.cpp b/src/headless/main.cpp index 3c9fc8b..9a054e3 100644 --- a/src/headless/main.cpp +++ b/src/headless/main.cpp @@ -35,24 +35,15 @@ static void print_rgo(ProvinceInstance const& province) { ); } else { - GoodDefinition const* const output_good = production_type->get_output_good(); - if(output_good == nullptr) { - Logger::error( - "\n ", province.get_identifier(), - " - good: nullptr", - ", production_type: ", production_type->get_identifier() - ); - } - else { - Logger::info( - "\n ", province.get_identifier(), - " - good: ", output_good->get_identifier(), - ", production_type: ", production_type->get_identifier(), - ", size_multiplier: ", rgo.get_size_multiplier().to_string(3), - ", output_quantity_yesterday: ", rgo.get_output_quantity_yesterday().to_string(3), - ", revenue_yesterday: ", rgo.get_revenue_yesterday().to_string(3) - ); - } + GoodDefinition const& output_good = production_type->get_output_good(); + Logger::info( + "\n ", province.get_identifier(), + " - good: ", output_good.get_identifier(), + ", production_type: ", production_type->get_identifier(), + ", size_multiplier: ", rgo.get_size_multiplier().to_string(3), + ", output_quantity_yesterday: ", rgo.get_output_quantity_yesterday().to_string(3), + ", revenue_yesterday: ", rgo.get_revenue_yesterday().to_string(3) + ); } } diff --git a/src/openvic-simulation/economy/production/ProductionType.cpp b/src/openvic-simulation/economy/production/ProductionType.cpp index 5889986..8bf82e8 100644 --- a/src/openvic-simulation/economy/production/ProductionType.cpp +++ b/src/openvic-simulation/economy/production/ProductionType.cpp @@ -22,7 +22,7 @@ ProductionType::ProductionType( template_type_t new_template_type, Pop::pop_size_t new_base_workforce_size, GoodDefinition::good_definition_map_t&& new_input_goods, - GoodDefinition const* new_output_good, + GoodDefinition const& new_output_good, fixed_point_t new_base_output_quantity, std::vector<bonus_t>&& new_bonuses, GoodDefinition::good_definition_map_t&& new_maintenance_requirements, @@ -169,7 +169,7 @@ bool ProductionTypeManager::add_production_type( } const bool ret = production_types.add_item({ - identifier, owner, std::move(jobs), template_type, base_workforce_size, std::move(input_goods), output_good, + identifier, owner, std::move(jobs), template_type, base_workforce_size, std::move(input_goods), *output_good, base_output_quantity, std::move(bonuses), std::move(maintenance_requirements), is_coastal, is_farm, is_mine }); diff --git a/src/openvic-simulation/economy/production/ProductionType.hpp b/src/openvic-simulation/economy/production/ProductionType.hpp index b06c9b5..790872b 100644 --- a/src/openvic-simulation/economy/production/ProductionType.hpp +++ b/src/openvic-simulation/economy/production/ProductionType.hpp @@ -47,7 +47,7 @@ namespace OpenVic { const Pop::pop_size_t PROPERTY(base_workforce_size); GoodDefinition::good_definition_map_t PROPERTY(input_goods); - GoodDefinition const* PROPERTY(output_good); + GoodDefinition const& PROPERTY(output_good); const fixed_point_t PROPERTY(base_output_quantity); std::vector<bonus_t> PROPERTY(bonuses); @@ -64,7 +64,7 @@ namespace OpenVic { template_type_t new_template_type, Pop::pop_size_t new_base_workforce_size, GoodDefinition::good_definition_map_t&& new_input_goods, - GoodDefinition const* new_output_goods, + GoodDefinition const& new_output_goods, fixed_point_t new_base_output_quantity, std::vector<bonus_t>&& new_bonuses, GoodDefinition::good_definition_map_t&& new_maintenance_requirements, diff --git a/src/openvic-simulation/map/ProvinceInstance.cpp b/src/openvic-simulation/map/ProvinceInstance.cpp index e8361da..4efcfee 100644 --- a/src/openvic-simulation/map/ProvinceInstance.cpp +++ b/src/openvic-simulation/map/ProvinceInstance.cpp @@ -42,7 +42,7 @@ ProvinceInstance::ProvinceInstance( GoodDefinition const* ProvinceInstance::get_rgo_good() const { if(!rgo.is_valid()) { return nullptr; } - return rgo.get_production_type()->get_output_good(); + return &(rgo.get_production_type()->get_output_good()); } void ProvinceInstance::set_rgo_production_type(ProductionType const& rgo_production_type) { if(rgo_production_type.get_template_type() != ProductionType::template_type_t::RGO) { |