diff options
Diffstat (limited to 'sim/src/Builder.cpp')
| -rw-r--r-- | sim/src/Builder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sim/src/Builder.cpp b/sim/src/Builder.cpp index af19974..4cf0bc6 100644 --- a/sim/src/Builder.cpp +++ b/sim/src/Builder.cpp @@ -3,10 +3,11 @@ #include <entt/entt.hpp> #include <kurator/engine/Point.h> +#include <kurator/sim/ai.h> #include <kurator/sim/components.h> #include <kurator/sim/FloatingMovement.h> #include <kurator/sim/HitPoints.h> -#include <kurator/sim/TurretControl.h> +#include <kurator/sim/weapons.h> #include <kurator/universe/ShipType.h> #include <kurator/universe/TurretType.h> @@ -41,7 +42,7 @@ Builder::operator()(const universe::ShipType& ship_type, const int team) const ship_type.max_speed, ship_type.max_speed * 2.0, ship_type.max_speed * 3.0); - registry.emplace<AIState>(entity, 15000.0, Point{0.0, 0.0}); + registry.emplace<AIShip>(entity, 15000.0, Point{0.0, 0.0}); registry.emplace<HitPoints>(entity, ship_type); return entity; } @@ -51,8 +52,7 @@ entt::entity Builder::operator()(const universe::TurretType& turret_type, const entt::entity& owner) const { const auto entity = registry.create(); - registry.emplace<universe::TurretType>(entity, turret_type); - registry.emplace<TurretControl>(entity, 0.0, 0.0, turret_type.rounds, owner); + registry.emplace<Turret>(entity, owner, turret_type); registry.emplace<Transform>(entity, Point{0.0, 0.0}, 0.0, owner); return entity; } |