Exported player to own class

1 files changed, 3 insertions, 9 deletions

diff --git a/GameScreen.cpp b/GameScreen.cpp
index 6dc8025..4a2fc22 100644
--- a/GameScreen.cpp
+++ b/GameScreen.cpp
@@ -2,11 +2,8 @@
 
 #include <raylib.h>
 
-#include "Bullets.h"
-
 
 GameScreen::GameScreen() :
-    m_pos {400, 300},
     m_const {}
 {
 }
@@ -15,15 +12,12 @@ GameScreen::GameScreen() :
 void
 GameScreen::update(const float dt)
 {
-    if (IsKeyDown(KEY_LEFT))
-        m_pos.x -= dt * 80;
-    if (IsKeyDown(KEY_RIGHT))
-        m_pos.x += dt * 80;
+    m_player.update(dt);
     m_generator.update(dt, m_const.m_bullets);
     m_const.update(dt);
     bool collided = false;
     for (const auto& bullet : m_const.m_bullets) {
-        if (CheckCollisionCircles(m_pos, 9, bullet.position, bullet.radius))
+        if (CheckCollisionCircles(m_player.m_position, 9, bullet.position, bullet.radius))
             collided = true;
     }
     (void) collided;
@@ -33,8 +27,8 @@ GameScreen::update(const float dt)
 void
 GameScreen::draw()
 {
-    DrawCircle(m_pos.x, m_pos.y, 10, LIGHTGRAY);
     m_const.draw();
+    m_player.draw();
     DrawFPS(5, 5);
     DrawText(TextFormat("%d", m_const.m_bullets.size()), 5, 25, 20, DARKGRAY);
 }