From e4701ebc08f57575a02bdc1777d9851a987c1cba Mon Sep 17 00:00:00 2001
From: hop311 <hop3114@gmail.com>
Date: Sun, 14 Jul 2024 15:01:25 +0100
Subject: Unit and leader rework (branch based templates and colony containers)

---
 src/openvic-simulation/military/Deployment.hpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/openvic-simulation/military/Deployment.hpp')

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(
-- 
cgit v1.2.3-56-ga3b1