diff options
author | Hop311 <Hop3114@gmail.com> | 2024-03-20 23:30:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-20 23:30:48 +0100 |
commit | eece77afebf0e4d36b4c9ace3b1044f2c3da50f1 (patch) | |
tree | d5b186facf7c3a08e6ccf2e8261b7de054957a41 /src/openvic-simulation/country/Country.hpp | |
parent | 2c892c99a6647be15ef23cabf6cc40f08769283d (diff) | |
parent | 023860d53a90774dcdba84ad7c0dca3c944c9a49 (diff) |
Merge pull request #147 from OpenVicProject/military-units
Military unit instance
Diffstat (limited to 'src/openvic-simulation/country/Country.hpp')
-rw-r--r-- | src/openvic-simulation/country/Country.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
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: |