diff options
| author |   hop311 <hop3114@gmail.com> | 2024-07-14 16:01:25 +0200 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2024-07-14 16:25:34 +0200 |
| commit | e4701ebc08f57575a02bdc1777d9851a987c1cba (patch) | |
| tree | db365e5d71df41b7b35abdcc3d4c0d76f1653619 /src/openvic-simulation/military/Deployment.hpp | |
| parent | b9b35ad9536cfdcd61f5208eeaad7ead4bd0418d (diff) | |
Unit and leader rework (branch based templates and colony containers)unit-colonies
Diffstat (limited to 'src/openvic-simulation/military/Deployment.hpp')
| -rw-r--r-- | src/openvic-simulation/military/Deployment.hpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/openvic-simulation/military/Deployment.hpp b/src/openvic-simulation/military/Deployment.hpp index 8d3f016..9a1d2ee 100644 --- a/src/openvic-simulation/military/Deployment.hpp +++ b/src/openvic-simulation/military/Deployment.hpp @@ -10,7 +10,6 @@ namespace OpenVic { struct ProvinceDefinition; - struct RegimentType; struct RegimentDeployment { friend struct DeploymentManager; @@ -26,8 +25,6 @@ namespace OpenVic { RegimentDeployment(RegimentDeployment&&) = default; }; - struct ShipType; - struct ShipDeployment { friend struct DeploymentManager; @@ -79,11 +76,11 @@ namespace OpenVic { private: std::vector<ArmyDeployment> PROPERTY(armies); std::vector<NavyDeployment> PROPERTY(navies); - std::vector<Leader> PROPERTY(leaders); + std::vector<LeaderBase> PROPERTY(leaders); Deployment( std::string_view new_path, std::vector<ArmyDeployment>&& new_armies, std::vector<NavyDeployment>&& new_navies, - std::vector<Leader>&& new_leaders + std::vector<LeaderBase>&& new_leaders ); public: @@ -101,7 +98,7 @@ namespace OpenVic { public: bool add_deployment( std::string_view path, std::vector<ArmyDeployment>&& armies, std::vector<NavyDeployment>&& navies, - std::vector<Leader>&& leaders + std::vector<LeaderBase>&& leaders ); bool load_oob_file( |