Extracted scenario setup from BaseBattle constructor

1 files changed, 14 insertions, 4 deletions

diff --git a/sim/src/BaseBattle.cpp b/sim/src/BaseBattle.cpp
index fa91134..0c23065 100644
--- a/sim/src/BaseBattle.cpp
+++ b/sim/src/BaseBattle.cpp
@@ -25,20 +25,30 @@ namespace sim
 {
 
 
+static void setup_scenario(entt::registry& registry, const campaign::Scenario& scenario);
+
+
 BaseBattle::BaseBattle(const campaign::Scenario& scenario) :
 	_registry {}
 {
+	setup_scenario(_registry, scenario);
+	manager.extend(_registry);
+}
+
+
+void
+setup_scenario(entt::registry& registry, const campaign::Scenario& scenario)
+{
 	RandomSpawner spawner {scenario.last_team(), scenario.radius, 0.1};
-	Builder build {_registry, spawner};
+	Builder build {registry, spawner};
 	for (const auto& ship : scenario.ships) {
 		const auto entity = build(ship.loadout.type, ship.team);
-		_registry.emplace<universe::UniqueIdentifier>(entity, ship.identifier);
-		auto& state = _registry.get<AIState>(entity);
+		registry.emplace<universe::UniqueIdentifier>(entity, ship.identifier);
+		auto& state = registry.get<AIState>(entity);
 		for (const auto& turret_type : ship.loadout.turrets) {
 			build(turret_type, entity);
 			state.keep_at_range = std::min(state.keep_at_range, turret_type.optimal_range);
 		}
-		manager.add(ship.team, entity);  // registry supports on construction events
 	}
 }