diff options
| author |   hop311 <hop3114@gmail.com> | 2024-06-07 00:20:58 +0200 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2024-06-07 12:28:16 +0200 |
| commit | 1198a780916e65cae048dd3478f614c1d18db846 (patch) | |
| tree | f681dd2e76d489ba6e7beea44ae6ebd59e9d51f3 /src/openvic-simulation/scripts | |
| parent | c94a06477fc3930e8f8f2e5f971fc4b5b838ea0d (diff) | |
Separated MapDefinition and MapInstancemap-instance
Diffstat (limited to 'src/openvic-simulation/scripts')
| -rw-r--r-- | src/openvic-simulation/scripts/Condition.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/openvic-simulation/scripts/Condition.cpp b/src/openvic-simulation/scripts/Condition.cpp index 5bf4067..238d0f8 100644 --- a/src/openvic-simulation/scripts/Condition.cpp +++ b/src/openvic-simulation/scripts/Condition.cpp @@ -361,7 +361,7 @@ bool ConditionManager::setup_conditions(GameManager const& game_manager) { ); import_identifiers( - game_manager.get_map().get_region_identifiers(), + game_manager.get_map_definition().get_region_identifiers(), GROUP, COUNTRY, STATE, @@ -370,7 +370,7 @@ bool ConditionManager::setup_conditions(GameManager const& game_manager) { ); import_identifiers( - game_manager.get_map().get_province_definition_identifiers(), + game_manager.get_map_definition().get_province_definition_identifiers(), GROUP, COUNTRY, PROVINCE, @@ -485,8 +485,8 @@ callback_t<std::string_view> ConditionManager::expect_parse_identifier( EXPECT_CALL_PLACEHOLDER(COUNTRY_FLAG); EXPECT_CALL_PLACEHOLDER(PROVINCE_FLAG); EXPECT_CALL(COUNTRY_TAG, country, game_manager.get_country_manager(), "THIS", "FROM", "OWNER"); - EXPECT_CALL(PROVINCE_ID, province_definition, game_manager.get_map(), "THIS", "FROM"); - EXPECT_CALL(REGION, region, game_manager.get_map()); + EXPECT_CALL(PROVINCE_ID, province_definition, game_manager.get_map_definition(), "THIS", "FROM"); + EXPECT_CALL(REGION, region, game_manager.get_map_definition()); EXPECT_CALL(IDEOLOGY, ideology, game_manager.get_politics_manager().get_ideology_manager()); EXPECT_CALL(REFORM_GROUP, reform_group, game_manager.get_politics_manager().get_issue_manager()); EXPECT_CALL(REFORM, reform, game_manager.get_politics_manager().get_issue_manager()); @@ -508,9 +508,9 @@ callback_t<std::string_view> ConditionManager::expect_parse_identifier( EXPECT_CALL(MODIFIER, static_modifier, game_manager.get_modifier_manager()); EXPECT_CALL(NATIONAL_VALUE, national_value, game_manager.get_politics_manager().get_national_value_manager()); EXPECT_CALL(CULTURE_UNION, country, game_manager.get_country_manager(), "THIS", "FROM", "THIS_UNION"); - EXPECT_CALL(CONTINENT, continent, game_manager.get_map()); + EXPECT_CALL(CONTINENT, continent, game_manager.get_map_definition()); EXPECT_CALL(CRIME, crime_modifier, game_manager.get_crime_manager()); - EXPECT_CALL(TERRAIN, terrain_type, game_manager.get_map().get_terrain_type_manager()); + EXPECT_CALL(TERRAIN, terrain_type, game_manager.get_map_definition().get_terrain_type_manager()); #undef EXPECT_CALL #undef EXPECT_CALL_PLACEHOLDER |