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/country | |
| parent | 2c892c99a6647be15ef23cabf6cc40f08769283d (diff) | |
feat: unit instance type definition, renamed existing structs for consistencymilitary-units
Diffstat (limited to 'src/openvic-simulation/country')
| -rw-r--r-- | src/openvic-simulation/country/Country.cpp | 4 | ||||
| -rw-r--r-- | src/openvic-simulation/country/Country.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/openvic-simulation/country/Country.cpp b/src/openvic-simulation/country/Country.cpp index 2b022b0..604e11f 100644 --- a/src/openvic-simulation/country/Country.cpp +++ b/src/openvic-simulation/country/Country.cpp @@ -196,9 +196,9 @@ bool CountryManager::load_country_data_file( ), "party", ZERO_OR_MORE, load_country_party(game_manager.get_politics_manager(), parties), "unit_names", ZERO_OR_ONE, - game_manager.get_military_manager().get_unit_manager().expect_unit_dictionary_reserve_length( + game_manager.get_military_manager().get_unit_type_manager().expect_unit_type_dictionary_reserve_length( unit_names, - [&unit_names](Unit const& unit, ast::NodeCPtr value) -> bool { + [&unit_names](UnitType const& unit, ast::NodeCPtr value) -> bool { return name_list_callback(map_callback(unit_names, &unit))(value); } ) diff --git a/src/openvic-simulation/country/Country.hpp b/src/openvic-simulation/country/Country.hpp index fd6fa7e..f115489 100644 --- a/src/openvic-simulation/country/Country.hpp +++ b/src/openvic-simulation/country/Country.hpp @@ -10,7 +10,7 @@ #include <openvic-dataloader/v2script/AbstractSyntaxTree.hpp> #include "openvic-simulation/dataloader/Dataloader.hpp" -#include "openvic-simulation/military/Unit.hpp" +#include "openvic-simulation/military/UnitType.hpp" #include "openvic-simulation/politics/Government.hpp" #include "openvic-simulation/politics/Ideology.hpp" #include "openvic-simulation/politics/Issue.hpp" @@ -51,7 +51,7 @@ namespace OpenVic { struct Country : HasIdentifierAndColour { friend struct CountryManager; - using unit_names_map_t = ordered_map<Unit const*, name_list_t>; + using unit_names_map_t = ordered_map<UnitType const*, name_list_t>; using government_colour_map_t = ordered_map<GovernmentType const*, colour_t>; private: |