diff options
author | Aki <please@ignore.pl> | 2022-04-20 00:28:48 +0200 |
---|---|---|
committer | Aki <please@ignore.pl> | 2022-04-20 00:28:48 +0200 |
commit | fd9232b3d3a3aee28a5965a5ebc4077f8db7c652 (patch) | |
tree | e9bdb832ed15704f5640ffc9543131f02e6e6e32 /Enemy.cpp | |
parent | 5f0c15b2d3299ea210a78d54e9b10c3cb4266139 (diff) | |
download | bullethell2022-fd9232b3d3a3aee28a5965a5ebc4077f8db7c652.zip bullethell2022-fd9232b3d3a3aee28a5965a5ebc4077f8db7c652.tar.gz bullethell2022-fd9232b3d3a3aee28a5965a5ebc4077f8db7c652.tar.bz2 |
Streamlined enemy composition
Diffstat (limited to 'Enemy.cpp')
-rw-r--r-- | Enemy.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -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); } |