diff options
| author |   zaaarf <me@zaaarf.foo> | 2024-02-12 12:15:04 +0100 |
|---|---|---|
| committer | zaaarf <me@zaaarf.foo> | 2024-03-16 14:01:15 +0100 |
| commit | 023860d53a90774dcdba84ad7c0dca3c944c9a49 (patch) | |
| tree | d5b186facf7c3a08e6ccf2e8261b7de054957a41 /src/openvic-simulation/research/Technology.cpp | |
| parent | 2c892c99a6647be15ef23cabf6cc40f08769283d (diff) | |
feat: unit instance type definition, renamed existing structs for consistencymilitary-units
Diffstat (limited to 'src/openvic-simulation/research/Technology.cpp')
| -rw-r--r-- | src/openvic-simulation/research/Technology.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvic-simulation/research/Technology.cpp b/src/openvic-simulation/research/Technology.cpp index 00b736c..027268e 100644 --- a/src/openvic-simulation/research/Technology.cpp +++ b/src/openvic-simulation/research/Technology.cpp @@ -144,10 +144,10 @@ bool TechnologyManager::load_technology_file_schools( } bool TechnologyManager::load_technologies_file( - ModifierManager const& modifier_manager, UnitManager const& unit_manager, BuildingTypeManager const& building_type_manager, + ModifierManager const& modifier_manager, UnitTypeManager const& unit_type_manager, BuildingTypeManager const& building_type_manager, ast::NodeCPtr root ) { - return expect_dictionary_reserve_length(technologies, [this, &modifier_manager, &unit_manager, &building_type_manager]( + return expect_dictionary_reserve_length(technologies, [this, &modifier_manager, &unit_type_manager, &building_type_manager]( std::string_view tech_key, ast::NodeCPtr tech_value ) -> bool { ModifierValue modifiers; @@ -167,7 +167,7 @@ bool TechnologyManager::load_technologies_file( "cost", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(cost)), "unciv_military", ZERO_OR_ONE, expect_bool(assign_variable_callback(unciv_military)), "unit", ZERO_OR_ONE, expect_uint(assign_variable_callback(unit)), - "activate_unit", ZERO_OR_MORE, unit_manager.expect_unit_identifier(set_callback_pointer(activated_units)), + "activate_unit", ZERO_OR_MORE, unit_type_manager.expect_unit_type_identifier(set_callback_pointer(activated_units)), "activate_building", ZERO_OR_MORE, building_type_manager.expect_building_type_identifier( set_callback_pointer(activated_buildings) ), |