diff options
| author |   zaaarf <80046572+zaaarf@users.noreply.github.com> | 2023-12-10 23:17:04 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-10 23:17:04 +0100 |
| commit | 34fbe27857d77d6f193d6d1848b953a4596cedd2 (patch) | |
| tree | 7f07835485b877f3c01c52c188892499e5812f9b /src/openvic-simulation/research/Technology.hpp | |
| parent | 1eb28bd4fb959b69a30013f6438f0257a2ee7b03 (diff) | |
| parent | 4ef33d4df6198e613b0f27406d49978c8ea2fb97 (diff) | |
Merge pull request #91 from OpenVicProject/registry-macro
Improved identifier registry macro
Diffstat (limited to 'src/openvic-simulation/research/Technology.hpp')
| -rw-r--r-- | src/openvic-simulation/research/Technology.hpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/openvic-simulation/research/Technology.hpp b/src/openvic-simulation/research/Technology.hpp index 52db87e..8489e9b 100644 --- a/src/openvic-simulation/research/Technology.hpp +++ b/src/openvic-simulation/research/Technology.hpp @@ -64,28 +64,22 @@ namespace OpenVic { }; struct TechnologyManager { - IdentifierRegistry<TechnologyFolder> technology_folders; - IdentifierRegistry<TechnologyArea> technology_areas; - IdentifierRegistry<Technology> technologies; - IdentifierRegistry<TechnologySchool> technology_schools; + IdentifierRegistry<TechnologyFolder> IDENTIFIER_REGISTRY(technology_folder); + IdentifierRegistry<TechnologyArea> IDENTIFIER_REGISTRY(technology_area); + IdentifierRegistry<Technology> IDENTIFIER_REGISTRY_CUSTOM_PLURAL(technology, technologies); + IdentifierRegistry<TechnologySchool> IDENTIFIER_REGISTRY(technology_school); public: - TechnologyManager(); - bool add_technology_folder(std::string_view identifier); - IDENTIFIER_REGISTRY_ACCESSORS(technology_folder) bool add_technology_area(std::string_view identifier, TechnologyFolder const* folder); - IDENTIFIER_REGISTRY_ACCESSORS(technology_area) bool add_technology( std::string_view identifier, TechnologyArea const* area, Date::year_t year, fixed_point_t cost, bool unciv_military, uint8_t unit, Technology::unit_set_t&& activated_units, Technology::building_set_t&& activated_buildings, ModifierValue&& values); - IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(technology, technologies) bool add_technology_school(std::string_view identifier, ModifierValue&& values); - IDENTIFIER_REGISTRY_ACCESSORS(technology_school) bool load_technology_file_areas(ast::NodeCPtr root); // common/technology.txt bool load_technology_file_schools(ModifierManager const& modifier_manager, ast::NodeCPtr root); // also common/technology.txt |