diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-07-04 10:38:54 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-07-04 10:38:54 +0200 |
| commit | 8c8b9349e26b4f606e18810a201ff378eaac19b2 (patch) | |
| tree | c8d10e8c2b38208401f30e9b3acf7fc4a071583f /src/openvic-simulation/scripts | |
| parent | bfd539513af435564daf70f94f6cce146dd5c948 (diff) | |
| parent | 326db6b4779bf3662752243d929ff3d605870049 (diff) | |
Merge pull request #167 from OpenVicProject/country-definition
Renamed Country to CountryDefinition
Diffstat (limited to 'src/openvic-simulation/scripts')
| -rw-r--r-- | src/openvic-simulation/scripts/Condition.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/openvic-simulation/scripts/Condition.cpp b/src/openvic-simulation/scripts/Condition.cpp index e5679f8..7abd717 100644 --- a/src/openvic-simulation/scripts/Condition.cpp +++ b/src/openvic-simulation/scripts/Condition.cpp @@ -352,7 +352,7 @@ bool ConditionManager::setup_conditions(DefinitionManager const& definition_mana /* Scopes from other registries */ import_identifiers( - definition_manager.get_country_manager().get_country_identifiers(), + definition_manager.get_country_definition_manager().get_country_definition_identifiers(), GROUP, COUNTRY, COUNTRY, @@ -484,7 +484,9 @@ callback_t<std::string_view> ConditionManager::expect_parse_identifier( EXPECT_CALL_PLACEHOLDER(GLOBAL_FLAG); EXPECT_CALL_PLACEHOLDER(COUNTRY_FLAG); EXPECT_CALL_PLACEHOLDER(PROVINCE_FLAG); - EXPECT_CALL(COUNTRY_TAG, country, definition_manager.get_country_manager(), "THIS", "FROM", "OWNER"); + EXPECT_CALL( + COUNTRY_TAG, country_definition, definition_manager.get_country_definition_manager(), "THIS", "FROM", "OWNER" + ); EXPECT_CALL(PROVINCE_ID, province_definition, definition_manager.get_map_definition(), "THIS", "FROM"); EXPECT_CALL(REGION, region, definition_manager.get_map_definition()); EXPECT_CALL(IDEOLOGY, ideology, definition_manager.get_politics_manager().get_ideology_manager()); @@ -507,7 +509,9 @@ callback_t<std::string_view> ConditionManager::expect_parse_identifier( EXPECT_CALL(MODIFIER, triggered_modifier, definition_manager.get_modifier_manager()); EXPECT_CALL(MODIFIER, static_modifier, definition_manager.get_modifier_manager()); EXPECT_CALL(NATIONAL_VALUE, national_value, definition_manager.get_politics_manager().get_national_value_manager()); - EXPECT_CALL(CULTURE_UNION, country, definition_manager.get_country_manager(), "THIS", "FROM", "THIS_UNION"); + EXPECT_CALL( + CULTURE_UNION, country_definition, definition_manager.get_country_definition_manager(), "THIS", "FROM", "THIS_UNION" + ); EXPECT_CALL(CONTINENT, continent, definition_manager.get_map_definition()); EXPECT_CALL(CRIME, crime_modifier, definition_manager.get_crime_manager()); EXPECT_CALL(TERRAIN, terrain_type, definition_manager.get_map_definition().get_terrain_type_manager()); |