From 068d56e95ab3a96c25ec3a2d2e8fff74e527a6eb Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 17 Nov 2022 00:15:33 +0100 Subject: Moved total teams to Scenario --- battles/src/BaseBattle.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'battles/src/BaseBattle.cpp') diff --git a/battles/src/BaseBattle.cpp b/battles/src/BaseBattle.cpp index f12a944..e7d70c2 100644 --- a/battles/src/BaseBattle.cpp +++ b/battles/src/BaseBattle.cpp @@ -15,12 +15,9 @@ namespace battles { -int total_teams_in(const Scenario& scenario); - - BaseBattle::BaseBattle(const Scenario& scenario) : _registry {}, - spawner {total_teams_in(scenario), 2.5, 0.1} + spawner {scenario.total_teams(), 2.5, 0.1} { const auto repo = universe::load_sample(); Builder build {_registry, spawner}; @@ -130,17 +127,5 @@ BaseBattle::kill_off_dead() } -int -total_teams_in(const Scenario& scenario) -{ - int last_team = 0; - for (const auto& ship : scenario.ships) { - if (ship.team > last_team) - last_team = ship.team; - } - return last_team + 1; -} - - } // namespace battles } // namespace kurator -- cgit v1.1