diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-11-17 10:19:53 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-11-17 10:19:53 +0100 |
| commit | e76336cd92639f4ec71088fc4c80aea4c25528cd (patch) | |
| tree | eeed419a7d97ecb58adf63a17eb9184db3e5ed7a /src/openvic-simulation/economy/Good.hpp | |
| parent | a00b558a53edb40c9e6789790036f0b618e80ec1 (diff) | |
| parent | 886b8b8f396438fc2b7da7d2508f2064d14150a8 (diff) | |
Merge pull request #75 from OpenVicProject/accumulated-changes
Accumulated changes
Diffstat (limited to 'src/openvic-simulation/economy/Good.hpp')
| -rw-r--r-- | src/openvic-simulation/economy/Good.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/economy/Good.hpp b/src/openvic-simulation/economy/Good.hpp index ae2d6a9..805e6a5 100644 --- a/src/openvic-simulation/economy/Good.hpp +++ b/src/openvic-simulation/economy/Good.hpp @@ -33,7 +33,7 @@ namespace OpenVic { using price_t = fixed_point_t; static constexpr price_t NULL_PRICE = fixed_point_t::_0(); - using good_map_t = decimal_map_t<Good const*>; + using good_map_t = fixed_point_map_t<Good const*>; private: GoodCategory const& category; @@ -73,7 +73,7 @@ namespace OpenVic { IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(good_category, good_categories) bool add_good( - std::string_view identifier, colour_t colour, GoodCategory const* category, Good::price_t base_price, + std::string_view identifier, colour_t colour, GoodCategory const& category, Good::price_t base_price, bool available_from_start, bool tradeable, bool money, bool overseas_penalty ); IDENTIFIER_REGISTRY_ACCESSORS(good) |