From c43ccc0cf61955a3ef4cccc8cbda38d730ea15ad Mon Sep 17 00:00:00 2001 From: wvpm <24685035+wvpm@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:41:06 +0200 Subject: Restore constructor for ResourceGatheringOperation to initialise from savegame --- .../production/ResourceGatheringOperation.cpp | 25 ++++++++++++++++++++++ .../production/ResourceGatheringOperation.hpp | 9 ++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp (limited to 'src/openvic-simulation/economy') diff --git a/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp b/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp new file mode 100644 index 0000000..14688ea --- /dev/null +++ b/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp @@ -0,0 +1,25 @@ +#include "ResourceGatheringOperation.hpp" +#include "types/fixed_point/FixedPoint.hpp" + +using namespace OpenVic; + +ResourceGatheringOperation::ResourceGatheringOperation( + ProductionType const* new_production_type, + fixed_point_t new_size_multiplier, + fixed_point_t new_revenue_yesterday, + fixed_point_t new_output_quantity_yesterday, + fixed_point_t new_unsold_quantity_yesterday, + ordered_map&& new_employees +) : production_type { new_production_type }, + revenue_yesterday { new_revenue_yesterday }, + output_quantity_yesterday { new_output_quantity_yesterday }, + unsold_quantity_yesterday { new_unsold_quantity_yesterday }, + size_multiplier { new_size_multiplier }, + employees { std::move(new_employees) +} {} + +ResourceGatheringOperation::ResourceGatheringOperation() : ResourceGatheringOperation { + nullptr, fixed_point_t::_0(), + fixed_point_t::_0(), fixed_point_t::_0() + , fixed_point_t::_0(), {} +} {} \ No newline at end of file diff --git a/src/openvic-simulation/economy/production/ResourceGatheringOperation.hpp b/src/openvic-simulation/economy/production/ResourceGatheringOperation.hpp index f5706e1..70a84c0 100644 --- a/src/openvic-simulation/economy/production/ResourceGatheringOperation.hpp +++ b/src/openvic-simulation/economy/production/ResourceGatheringOperation.hpp @@ -15,6 +15,15 @@ namespace OpenVic { ordered_map PROPERTY(employees); public: + ResourceGatheringOperation( + ProductionType const* new_production_type, + fixed_point_t new_size_multiplier, + fixed_point_t new_revenue_yesterday, + fixed_point_t new_output_quantity_yesterday, + fixed_point_t new_unsold_quantity_yesterday, + ordered_map&& new_employees + ); + ResourceGatheringOperation(); constexpr bool is_valid() const { return production_type != nullptr; } -- cgit v1.2.3-56-ga3b1