Extracted Scenario and related things into own campaign module

4 files changed, 2 insertions, 67 deletions

diff --git a/sim/include/kurator/sim/Battle.h b/sim/include/kurator/sim/Battle.h
index e1728f4..0b20ce8 100644
--- a/sim/include/kurator/sim/Battle.h
+++ b/sim/include/kurator/sim/Battle.h
@@ -5,7 +5,7 @@
 #include <entt/entity/registry.hpp>
 #include <entt/signal/dispatcher.hpp>
 
-#include "Scenario.h"
+#include <kurator/campaign/Scenario.h>
 
 
 namespace kurator
@@ -24,7 +24,7 @@ public:
 };
 
 
-auto prepare(const Scenario& scenario) -> std::unique_ptr<Battle>;
+auto prepare(const campaign::Scenario& scenario) -> std::unique_ptr<Battle>;
 
 
 }  // namespace sim
diff --git a/sim/include/kurator/sim/Scenario.h b/sim/include/kurator/sim/Scenario.h
deleted file mode 100644
index b037365..0000000
--- a/sim/include/kurator/sim/Scenario.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-
-#include "ShipConfig.h"
-
-
-namespace kurator
-{
-namespace sim
-{
-
-
-struct Scenario
-{
-	std::string name;
-	std::vector<ShipConfig> ships;
-	int total_teams() const;
-};
-
-
-}  // namespace sim
-}  // namespace kurator
diff --git a/sim/include/kurator/sim/ShipConfig.h b/sim/include/kurator/sim/ShipConfig.h
deleted file mode 100644
index bb089ac..0000000
--- a/sim/include/kurator/sim/ShipConfig.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-
-
-namespace kurator
-{
-namespace sim
-{
-
-
-struct ShipConfig
-{
-	int team;
-	std::string type;
-	std::vector<std::string> turrets;
-};
-
-
-}  // namespace sim
-}  // namespace kurator
diff --git a/sim/include/kurator/sim/scenarios.h b/sim/include/kurator/sim/scenarios.h
deleted file mode 100644
index d22b62a..0000000
--- a/sim/include/kurator/sim/scenarios.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "Scenario.h"
-
-
-namespace kurator
-{
-namespace sim
-{
-namespace scenarios
-{
-
-
-Scenario example();
-
-
-}  // namespace scenarios
-}  // namespace sim
-}  // namespace kurator