summaryrefslogtreecommitdiffhomepage
path: root/Enemy.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Enemy.cpp')
-rw-r--r--Enemy.cpp15
1 files changed, 7 insertions, 8 deletions
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);
}