From 632c367ae6885657e6c99b96b8bf7a96b61a2bb9 Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Tue, 14 Feb 2023 00:13:02 +0100
Subject: Extracted basic simulation behaviour and that part of state to own
 class

---
 sim/include/kurator/sim.h         |  4 +++-
 sim/include/kurator/sim/System.h  | 18 ++++++++++++++++++
 sim/include/kurator/sim/systems.h | 17 -----------------
 3 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 sim/include/kurator/sim/System.h
 delete mode 100644 sim/include/kurator/sim/systems.h

(limited to 'sim/include')

diff --git a/sim/include/kurator/sim.h b/sim/include/kurator/sim.h
index 3c4364c..3330c48 100644
--- a/sim/include/kurator/sim.h
+++ b/sim/include/kurator/sim.h
@@ -3,6 +3,7 @@
 #include <kurator/campaign/Scenario.h>
 
 #include "sim/State.h"
+#include "sim/System.h"
 
 
 namespace kurator
@@ -11,7 +12,8 @@ namespace sim
 {
 
 
-void load_scenario(State& ctx, const campaign::Scenario& scenario);
+auto load_scenario(const campaign::Scenario& scenario) -> State;
+auto base_simulation_systems(State& ctx) -> System;
 
 
 }  // namespace sim
diff --git a/sim/include/kurator/sim/System.h b/sim/include/kurator/sim/System.h
new file mode 100644
index 0000000..101812a
--- /dev/null
+++ b/sim/include/kurator/sim/System.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <functional>
+
+#include <kurator/engine/Context.h>
+
+
+namespace kurator
+{
+namespace sim
+{
+
+
+using System = std::function<void(engine::Context&)>;
+
+
+}  // namespace sim
+}  // namespace kurator
diff --git a/sim/include/kurator/sim/systems.h b/sim/include/kurator/sim/systems.h
deleted file mode 100644
index 76353c2..0000000
--- a/sim/include/kurator/sim/systems.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <kurator/engine/Context.h>
-
-
-namespace kurator
-{
-namespace sim
-{
-
-
-void keep_at_range(engine::Context& ctx);
-void kill_off_dead(engine::Context& ctx);
-
-
-}  // namespace sim
-}  // namespace kurator
-- 
cgit v1.1