From fd9232b3d3a3aee28a5965a5ebc4077f8db7c652 Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Wed, 20 Apr 2022 00:28:48 +0200
Subject: Streamlined enemy composition

---
 Enemy.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'Enemy.cpp')

diff --git a/Enemy.cpp b/Enemy.cpp
index a8e87a3..083c890 100644
--- a/Enemy.cpp
+++ b/Enemy.cpp
@@ -14,22 +14,21 @@
 Enemy::Enemy() :
     m_hold {0},
     m_position {std::make_shared<Vector2>(Vector2{400.f, 300.f})},
-    m_generator {std::make_unique<NullGenerator>()},
-    m_behaviour {std::make_unique<NullBehaviour>()}
+    m_generator {std::make_shared<NullGenerator>()},
+    m_behaviour {std::make_shared<NullBehaviour>()}
 {
 }
 
 
 Enemy::Enemy(
         std::shared_ptr<Vector2> position,
-        std::unique_ptr<Generator> generator,
-        std::unique_ptr<Behaviour> behaviour) :
+        std::shared_ptr<Generator> generator,
+        std::shared_ptr<Behaviour> behaviour) :
     m_hold {0},
     m_position {position},
-    m_generator {std::move(generator)},
-    m_behaviour {std::move(behaviour)}
+    m_generator {generator},
+    m_behaviour {behaviour}
 {
-    m_generator->attach(m_position);
 }
 
 
@@ -40,7 +39,7 @@ Enemy::update(const float dt)
         m_hold -= dt;
         return;
     }
-    m_behaviour->update(dt, *m_position, *m_generator);
+    m_behaviour->update(dt);
     m_generator->update(dt);
 }
 
-- 
cgit v1.1