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.hpp | |
parent | 2c892c99a6647be15ef23cabf6cc40f08769283d (diff) |
feat: unit instance type definition, renamed existing structs for consistencymilitary-units
Diffstat (limited to 'src/openvic-simulation/research/Technology.hpp')
-rw-r--r-- | src/openvic-simulation/research/Technology.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvic-simulation/research/Technology.hpp b/src/openvic-simulation/research/Technology.hpp index aa47301..c67ebc0 100644 --- a/src/openvic-simulation/research/Technology.hpp +++ b/src/openvic-simulation/research/Technology.hpp @@ -3,7 +3,7 @@ #include <cstdint> #include "openvic-simulation/economy/BuildingType.hpp" -#include "openvic-simulation/military/Unit.hpp" +#include "openvic-simulation/military/UnitType.hpp" #include "openvic-simulation/misc/Modifier.hpp" #include "openvic-simulation/scripts/ConditionalWeight.hpp" #include "openvic-simulation/types/Date.hpp" @@ -42,7 +42,7 @@ namespace OpenVic { struct Technology : Modifier { friend struct TechnologyManager; - using unit_set_t = ordered_set<Unit const*>; + using unit_set_t = ordered_set<UnitType const*>; using building_set_t = ordered_set<BuildingType const*>; private: @@ -100,7 +100,7 @@ namespace OpenVic { /* Loaded from "technologies/.txt" files named after technology folders. */ bool load_technologies_file( - ModifierManager const& modifier_manager, UnitManager const& unit_manager, + ModifierManager const& modifier_manager, UnitTypeManager const& unit_type_manager, BuildingTypeManager const& building_type_manager, ast::NodeCPtr root ); |