diff options
| author |   hop311 <hop3114@gmail.com> | 2024-09-13 01:11:33 +0200 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2024-09-13 01:11:33 +0200 |
| commit | 81e00e3291834dbae6e70224651bf66198ba154e (patch) | |
| tree | 071de89f19e8fee2a51c8e5065cb25734a6ed2d1 /src/openvic-simulation/misc | |
| parent | a424969548083a977480a6be0f078760a5789bbf (diff) | |
Calculate country and province modifier sums (WIP)resultant-modifier
Diffstat (limited to 'src/openvic-simulation/misc')
| -rw-r--r-- | src/openvic-simulation/misc/Modifier.cpp | 4 | ||||
| -rw-r--r-- | src/openvic-simulation/misc/Modifier.hpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/openvic-simulation/misc/Modifier.cpp b/src/openvic-simulation/misc/Modifier.cpp index 9163af5..cbf6250 100644 --- a/src/openvic-simulation/misc/Modifier.cpp +++ b/src/openvic-simulation/misc/Modifier.cpp @@ -102,8 +102,8 @@ bool TriggeredModifier::parse_scripts(DefinitionManager const& definition_manage return trigger.parse_script(false, definition_manager); } -ModifierInstance::ModifierInstance(Modifier const& modifier, Date expiry_date) - : modifier { modifier }, expiry_date { expiry_date } {} +ModifierInstance::ModifierInstance(Modifier const& new_modifier, Date new_expiry_date) + : modifier { &new_modifier }, expiry_date { new_expiry_date } {} bool ModifierManager::add_modifier_effect(std::string_view identifier, bool positive_good, ModifierEffect::format_t format) { if (identifier.empty()) { diff --git a/src/openvic-simulation/misc/Modifier.hpp b/src/openvic-simulation/misc/Modifier.hpp index bd72a1e..a087d8d 100644 --- a/src/openvic-simulation/misc/Modifier.hpp +++ b/src/openvic-simulation/misc/Modifier.hpp @@ -102,10 +102,11 @@ namespace OpenVic { struct ModifierInstance { private: - Modifier const& PROPERTY(modifier); + Modifier const* PROPERTY(modifier); // We can assume this is never null Date PROPERTY(expiry_date); - ModifierInstance(Modifier const& modifier, Date expiry_date); + public: + ModifierInstance(Modifier const& new_modifier, Date new_expiry_date); }; template<typename Fn> |