Extract enemy starter movement values to dedicated struct

Author: NikolaJelic

src/enemy.cpp

@@ -1,13 +1,14 @@
 #include <enemy.hpp>
 #include <algorithm>
+#include "enemy_params.hpp"
 #include "glm/ext/vector_float2.hpp"
 #include "glm/geometric.hpp"
 #include "kvf/color.hpp"
 #include "util/random.hpp"
 
 namespace miracle {
-Enemy::Enemy(gsl::not_null<le::ServiceLocator const*> services, glm::vec2 target_pos, float move_speed)
-	: m_services(services), m_target_pos(target_pos), m_move_speed(move_speed), m_diameter(util::random_range(40.0f, 60.0f)) {
+Enemy::Enemy(gsl::not_null<le::ServiceLocator const*> services, EnemyParams const& params)
+	: m_services(services), m_target_pos(params.target_pos), m_move_speed(params.move_speed), m_diameter(util::random_range(40.0f, 60.0f)) {
 	m_sprite.create(m_diameter, kvf::red_v);
 	auto const framebuffer_size = m_services->get<le::Context>().framebuffer_size();
 	auto const radius = static_cast<float>(std::max(framebuffer_size.x, framebuffer_size.y)) / 2.0f;

src/enemy.hpp

@@ -7,13 +7,14 @@
 #include <le2d/renderer.hpp>
 #include <le2d/service_locator.hpp>
 #include <optional>
+#include "enemy_params.hpp"
 #include "glm/ext/vector_float2.hpp"
 #include "le2d/texture.hpp"
 
 namespace miracle {
 class Enemy {
   public:
-	explicit Enemy(gsl::not_null<le::ServiceLocator const*> services, glm::vec2 target_pos, float move_speed);
+	explicit Enemy(gsl::not_null<le::ServiceLocator const*> services, EnemyParams const& params);
 
 	void render(le::Renderer& renderer) const;
 	void translate(kvf::Seconds dt);

src/enemy_params.hpp

@@ -0,0 +1,7 @@
+#pragma once
+#include "glm/ext/vector_float2.hpp"
+
+struct EnemyParams {
+	glm::vec2 target_pos{};
+	float move_speed{};
+};

src/game.cpp

@@ -1,10 +1,10 @@
 #include <game.hpp>
 #include <glm/gtx/norm.hpp>
 #include <le2d/context.hpp>
-#include <algorithm>
 #include <cstddef>
 #include <vector>
 #include "enemy.hpp"
+#include "enemy_params.hpp"
 #include "kvf/time.hpp"
 #include "lighhouse.hpp"
 #include "util/random.hpp"
@@ -48,7 +48,9 @@ void Game::spawn_wave() {
 	std::vector<Enemy> new_wave;
 	std::size_t const wave_size = m_wave_count * 3;
 	new_wave.reserve(wave_size);
-	for (std::size_t i = 0; i < wave_size; ++i) { new_wave.emplace_back(m_services, glm::vec2{0.0f, 0.0f}, util::random_range(35.0f, 65.0f)); }
+	for (std::size_t i = 0; i < wave_size; ++i) {
+		new_wave.emplace_back(m_services, EnemyParams{.target_pos = glm::vec2{0.0f, 0.0f}, .move_speed = util::random_range(35.0f, 65.0f)});
+	}
 	m_enemies.insert(m_enemies.end(), std::make_move_iterator(new_wave.begin()), std::make_move_iterator(new_wave.end()));
 }
 } // namespace miracle