Extracted ship loadout into own class

2 files changed, 26 insertions, 4 deletions

diff --git a/campaign/include/kurator/campaign/Loadout.h b/campaign/include/kurator/campaign/Loadout.h
new file mode 100644
index 0000000..e528fd9
--- /dev/null
+++ b/campaign/include/kurator/campaign/Loadout.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <vector>
+
+#include <kurator/universe/ShipType.h>
+#include <kurator/universe/TurretType.h>
+
+
+namespace kurator
+{
+namespace campaign
+{
+
+
+struct Loadout
+{
+	universe::ShipType type;
+	std::vector<universe::TurretType> turrets;
+};
+
+
+}  // namespace campaign
+}  // namespace kurator
diff --git a/campaign/include/kurator/campaign/ShipConfig.h b/campaign/include/kurator/campaign/ShipConfig.h
index c8ee449..d596206 100644
--- a/campaign/include/kurator/campaign/ShipConfig.h
+++ b/campaign/include/kurator/campaign/ShipConfig.h
@@ -3,10 +3,10 @@
 #include <string>
 #include <vector>
 
-#include <kurator/universe/ShipType.h>
-#include <kurator/universe/TurretType.h>
 #include <kurator/universe/UniqueIdentifier.h>
 
+#include "Loadout.h"
+
 
 namespace kurator
 {
@@ -18,8 +18,7 @@ struct ShipConfig
 {
 	universe::UniqueIdentifier identifier;
 	int team;
-	universe::ShipType type;
-	std::vector<universe::TurretType> turrets;
+	Loadout loadout;
 };