Streamlined enemy composition

1 files changed, 6 insertions, 4 deletions

diff --git a/EnemyFactory.cpp b/EnemyFactory.cpp
index b573228..8a51c3f 100644
--- a/EnemyFactory.cpp
+++ b/EnemyFactory.cpp
@@ -18,13 +18,15 @@ EnemyFactory::make_example(
     const bool mirror)
 {
     auto position = std::make_shared<Vector2>(Vector2{x, y});
-    auto generator = std::make_unique<ExampleGenerator>(bullets);
-    auto behaviour = std::make_unique<FallingAndOscillating>();
+    auto generator = std::make_shared<ExampleGenerator>(position, bullets);
+    auto behaviour = std::make_shared<FallingAndOscillating>(position, generator);
+    generator->m_position = position;
     if (mirror) {
+        generator->m_color = Color{100, 0, 255, 255};
         generator->m_direction *= -1;
-        behaviour->set_phase(1.f);
+        behaviour->m_phase = 1.f;
     }
-    Enemy enemy(position, std::move(generator), std::move(behaviour));
+    Enemy enemy(position, generator, behaviour);
     enemy.m_hold = hold;
     return enemy;
 }