diff options
| author |   zaaarf <80046572+zaaarf@users.noreply.github.com> | 2024-01-07 23:51:06 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-01-07 23:51:06 +0100 |
| commit | 79b8b73304753fedab822e6aa859fa15673f52cc (patch) | |
| tree | cb25cfb89f8b06fc34f5c906e658a1b322120089 /src/openvic-simulation/politics/NationalFocus.cpp | |
| parent | 400469f08f10ffd044d9948c3f0db340c8a60db0 (diff) | |
| parent | 6f07de81a6ca430c522527958e05440d67b04937 (diff) | |
Merge pull request #111 from OpenVicProject/conditions-checking
Condition definition checking/loading
Diffstat (limited to 'src/openvic-simulation/politics/NationalFocus.cpp')
| -rw-r--r-- | src/openvic-simulation/politics/NationalFocus.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/openvic-simulation/politics/NationalFocus.cpp b/src/openvic-simulation/politics/NationalFocus.cpp index d4066af..e509039 100644 --- a/src/openvic-simulation/politics/NationalFocus.cpp +++ b/src/openvic-simulation/politics/NationalFocus.cpp @@ -1,7 +1,5 @@ #include "NationalFocus.hpp" -#include "openvic-simulation/dataloader/NodeTools.hpp" - using namespace OpenVic; using namespace OpenVic::NodeTools; @@ -74,7 +72,7 @@ bool NationalFocusManager::load_national_foci_file(PopManager const& pop_manager NationalFocus::pop_promotion_map_t promotions; NationalFocus::party_loyalty_map_t loyalties; NationalFocus::production_map_t production; - ConditionScript limit; + ConditionScript limit { scope_t::PROVINCE | scope_t::COUNTRY, scope_t::PROVINCE | scope_t::COUNTRY, scope_t::NO_SCOPE }; Ideology const* last_specified_ideology = nullptr; // weird, I know |